This removes some monkey patches and makes testing easier. It will also support database backed I18n changes.