Revert "Merge branch 'refactor-locale' into new-bidirectional-CPLevelIndicator-behaviour"

This reverts commit 621be9cd8e8aa4c8b1aaa074d0f159f1f5cc615e, reversing
changes made to 8d4e1bf7ed4c10fd3a576805b360dee1b5d7e8b6.