Revert "Simplify handling of the locale argument to Faker"
Revert "Simplify handling of the locale argument to Faker"

This reverts commit bacfd73de3bde2b4e680a7e28b2e3140b3a61d3a.

The commit only fixed a surface issue, but didn't address the underlying
issue: a call to factory.Maybe doesn't properly call the unroll_context
of the declarations it's wrapping.

FactoryBoy/factory_boy