Revert r10854

:: upstream revision 10855 ::