Revert "Merge pull request #1 from discourse/master"

This reverts commit e732f89fe1c2652db06a25eabb91dbe453ec5b46, reversing
changes made to c5f03986c0291ddb195ae59cf957949be90fc3a4.

Conflicts:
	app/assets/javascripts/admin/templates/customize.js.handlebars