Revert (most of) r185393 and r185395.