Revert "Max keys fetched, improvements for VOD support"

This reverts commit 4154bda7671dd253aa40ac53fe67e0b2082c108c.