Revert "Basic structural redefinition support" am: 5a2301d897
am: 917ee0b22e

Change-Id: I543663ffb2eb7f7f368d0b6d5dee9974ba4a9182