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

Change-Id: Ida2f80a790d745f6a2903f9e103e4806b5c4c43f