Added (disabled) patch to try to speed up forward seek in some cases.