I'm loathe to change its behavior as I only moved it. I'm happy to promote it to the mixin if that will work and revert to using the existing call pattern. We can add the refactoring of its behavior to tech debt.