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

Change-Id: Ic346400e1ed16a1617a0958358656472514c6b0f