Done. cc @smlemk
https://github.com/discourse/discourse/commit/0744e84604e7e056f59ee7f7725f009ecaeb4293