Revert "SERVER-2094 distinct only wants the field it's distinct-ing over"

This reverts commit 3b5b31f42d390e9da23f66e78a300d997ae653c4.
Merge remote-tracking branch 'upstream/master'