am f47fa7b3: Merge "Revert accidental default collector type change."

* commit 'f47fa7b3b04eeb1e1bea4813a64c632dc387629d':
  Revert accidental default collector type change.