How about this?
https://github.com/discourse/discourse/pull/36658/changes/e3a16f952b7283a4365adc1b097d6960e40c93d7