MessageConnector fix for service provider. (To keep it in sync with the
one in initializer)