This reverts commit r223306 and r223277.