The revert is now done:
https://github.com/discourse/discourse/commit/665a87a32ffa391f39905908521e7ec91bdbd24c