Bringing back CommonServiceLocator