Revert^2 "Remove finalizable restriction on structural redefinition"
am: 2f4942879d

Change-Id: I1726f7f72d2f107686a0eaea15d96be13e774d93