undo small changes to mixins