Revert "Remove dead code."

This reverts commit r207884 which was prematurely committed by accident.