Rewrite locale loader again