Bug 1011464 - re-introduce locales. r=jryans