Revert "Disable fast-forward if HLS used"

This reverts commit 016459841161cbfe8f57392b0cccb3d2de302fc1.