Revert accidental commit r179015.