Revert r216439 (and r216441, else the former doesn't revert cleanly).