Revert "Merge branch 'master' of github.com:discourse/discourse"

This reverts commit 9c7a83f0473845bcf1eb64784af0e45d96587bd3, reversing
changes made to be6f2993da0bc1ae365b96baa6c6c62fa0246822.