Could we do the evil thing for the time being, then hope my PR (or a variant of it) is merged soon?  We can revert + switch to it once released on the Forge.