Revert^2 "Class redefinition sometimes needs to update verification"
am: b1eebde946

Change-Id: I4ef4857e624a26ad763dfe249674f05267a7642c