removing service provider; applying fix from cvollmann