PR 78534 Revert r244011