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

Change-Id: I98a61a40dc428aaf88dbacc8bbc12c8d23033aa8