Merge change 24098 into eclair

* changes:
  Fix bug where we wouldn't release remote provider references.