This reverts commit 3590335221. Conflicts: app/views/layouts/site.html.erb config/locales/en.yml
3590335221