Whenever this PR is merged
https://github.com/discourse/discourse/pull/6425
EDIT: this PR is now merged