Just landed
https://github.com/discourse/discourse/commit/58b0e945bd955b0cf700f23ea6ea35d62bd79815
on master.