Revert r182909.

PR/16177