Revert "Initial support for adding virtuals with structural redefinition"
am: d0e354e54d

Change-Id: I131650c63ff55c3a4dde5d246290d0bd941b24a8