Back out changes not pertaining to private API; those files should not have been updated.