PR #965 breaks mixins #967
Description
The changes in #965 can result in mixin application failures: https://mclo.gs/rn9Glcl
While mixin impacts aren't technically breaking changes, we still don't really want to break an unknown number of addons this close to a release, so we'll resolve this issue by reverting #965 and revisiting this change at a later date.