Readded the Locale component and added a deprecated note