am 47b989bf: This should fix a monkey bug where the service was being used after it was unbound.

Merge commit '47b989bf6205eb8dd51c2c1fa118f6b703f2f66d'

* commit '47b989bf6205eb8dd51c2c1fa118f6b703f2f66d':
  This should fix a monkey bug where the service was being used after it was unbound.