Revert some accidental checkins.