PR in
https://github.com/discourse/discourse/pull/4499
Would love to get @eviltrout’s thoughts first before merging