Revert r88046 due to revert of parent revision r88043.