Done in https://github.com/discourse/discourse/commit/467c17da53a9fe3c1f83c8c0321fd822ca5833fd and https://github.com/discourse/discourse/commit/cb70a328f51a25cd278df8f71d88f45df007740a