Revert r198819 - "Remove dead code."