Newer-ish solution.

Spend some more time on newer and still can't get it to work. I'm nervous about merging this in because it will cripple devs working on other things so this is a temporary solution until we can get newer working.