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

Change-Id: I223d1400c9de469d00c976535a62c1411a28c2c7