revert didn't do what I expected...

Change-Id: If65962402a68dc1adec541996e263d93b07d6444