Reverted use of ToV2FeedPackage helper in OData queries

Fixes #773