Reverted r91942,r91943,r91949,r92156 per CR