Revert r197043, not a good comment