Revert "Removed option & locale, no longer needed"

This reverts commit 4c16f60da8b6eb2acd256a30f0509abc4dc2ff3c.