Revert "Force default locale is none is set"

This reverts commit 2fdd1ba86c3205581f0f099c00fae0c0cedbe4ec.
Fix locale loading