CSHARP-666: Changed based on code review.