This reverts commit r201625 and r201624.