This should now be fixed for good
https://github.com/discourse/discourse/commit/46b6c55197a41e13c163f10e00138d78d6e79820