Reverted handlebars change