Revert "*8901* 2.4.5 locale changes"

This reverts commit 839efba456ea2dbb7b7b1f71b66516afc2c79ffc.