Revert "Merge latest changes from discourse/discourse"

This reverts commit 5a8620333ed558f9d8e8d6c233eb41cc1086b72e, reversing
changes made to b5e570b13381fcd076b2b2548c73576769ebbf12.