Dropped deprecated clumsy/locale requirement
Dropped deprecated clumsy/locale requirement