Revert r198979 - accidental commit.