Just to loop back here - this has now been merged.
https://github.com/discourse/discourse/pull/20505/files
