Revert bogus changeset 11548.