Revert "Class redefinition sometimes needs to update verification" am: 2cf00ede14 am: 5539c95ec5
am: 0e0e3e16f9

Change-Id: I2062cea72d802a56594eb2a1b60817cfa3074d77