Okay, I’ve just pushed out a couple of commits to take a stab at this. They’re deploying now:
https://github.com/discourse/discourse/commit/36449aa2f25025d6786667e205dadcdbaa971d3b
and
https://github.com/discourse/discourse/commit/4dcb29acbf79c2a848300118116644ab4298c3b2