Reverted use of ToV2FeedPackage helper in OData queries

Fixes #773

I'm cherry-picking this in to 'preview', this is the code review for properly integrating it in to dev.