Revert "Basic structural redefinition support"
am: 5a2301d897

Change-Id: If637b825c39a036c229933f5bd8f6e910f1e4ef8