Wish we could use a mixin here, but I know our mixin doesn't support this behavior :sob: