Merge "Fix bug in provider removal"