Revert "Allow structural redefinition on non-final classes." am: 88b1c83080
am: 572382e86a

Change-Id: I2cfa678f2a4050dbfbef3dc1bd9d24322fc2a7b7