Revert r175688 - It broke a test case (see PR15320).