Revert^2 "Class redefinition sometimes needs to update verification" am: b1eebde946 am: 42f75794f6
am: 3b785d137d

Change-Id: I844c3ca5c7da95fed5889035608ba530728a0e87