Remove unwanted changes.

These unloved and unappreciated changes were made in error in
893c593645b7fa04731c7be012e6b6c724a3d911.

Change-Id: Id92cd00f6f152a6054ce3c995926d7239a95a32c