Revert "SERVER-15062 change redundant branch to invariant"

This reverts commit 0331a4b573409272919aa0bccf4f341455e19985.
Merge remote-tracking branch 'upstream/master'