Revert gutting mixins