This reverts commit r211533 and r211539.