Cleaned up here:
https://github.com/discourse/discourse/commit/de47b35b2d096d0fc9ac22e8cb85a38bba39bd70