Revert "Merge pull request #90 from NuGet/nuget-2.5-danliu"

This reverts commit 164cb6b34c3f556a63d27ebf6d78323eead63597, reversing
changes made to babfa5e1ebecf8efacde3494db4bb97d45f8a1ff.