Merge "Revert accidental default collector type change."