This reverts commit r241350 and r241352.