Fixes #1646 by reverting part of the fix of #1370.
Fix broken unit tests
Merge pull request #1653 from NuGet/tilovell/1370-ManagePackagesPageBrokenForBhuva

Tilovell/1370 manage packages page broken for bhuva