Revert "Avoid jumps to faulty position after seeks"

This reverts commit 2bb4160f700470cfbcecf907d0a883b2a1058644, let's
see if this is what's actually causing the seek loops in streaming
video...
Merge remote-tracking branch 'cm/cm-11.0' into HEAD