Revert "Merge pull request #16461 from gittup/bug-917630"

This reverts commit 0576cd37dfca32392c7d88a4dbafa49f47c30690, reversing
changes made to c5cb252e5d1aa45d14f3a2ea182e73e2271e4496.