Revert r162034, r162035 and r162037.