Revert "Revert "Basic structural redefinition support""
am: 4ac0e1571e

Change-Id: I454728ac3566b9083eaf5e4c96d954826d61cb2e