Revert "Merge branch 'mixins'"

This reverts commit 2b339b182b09e265a7351339d610d6f6973d6dad, reversing
changes made to 8e22ef7cdfa53459340d603c45951c617c14c7aa.