Revert^3 "Initial support for adding virtuals with structural redefinition" am: 2f8c1ac61b
am: 0ce081669d

Change-Id: I94d7e0c9436aa7b6e0b0eebf7483a0cd13868914