Revert service provider, fixes #280