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

Change-Id: I59d3384aecb29f7a25aeac7a55bca94faf5e7c27