Revert r176408 and r176407 to address PR15540.