Revert r81681 (issue 8810).
1 file changed