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

Change-Id: Ieb92228ce355f5840e82f6fd42991b9629c4862c