Revert^2 "Initial support for adding virtuals with structural redefinition"
am: 8ba9738d55

Change-Id: I921912b85ee09f692d898419be9d41dba0b05233