Reverting locale and setup changes, they're in another branch.