Revert^4 "Initial support for adding virtuals with structural redefinition" am: 986914bfd6
am: 016ecf69a5

Change-Id: I2cf3a365e304b0868895d30b3606fc268e3c6080