This is now merged
https://github.com/discourse/discourse/commit/d2bceff133ac152678a1407d45fea260a0fe8536