Revert "Added support for locale switching in some aspects"

This reverts commit ae4ae921c8a188dace655c4bce74d30e78f698ad.
Merge branch 'ceon-1' into dspace-3_x