We got this PR merged
https://github.com/discourse/discourse/commit/f0c6dd56825d96dce337e709c71d41740cbbca99