Cleanup while debugging #1620, including removing a duplicate call into our i18n middleware.