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

Change-Id: Ied0df9fe42cacda79ec405f302d41cf22faa4e5d