Revert r55877 per bug 22343