To revert layouts, do class stripping first