Revert "Revert jump rework"

This reverts commit e9a69e85e030aa25cb1f841650afd6b7e326489b.
Revert "Revert "Revert jump rework""

This reverts commit 331e03328fbe014d9c26f5a3c87f98bbe2e07964.
Revert "Revert "Revert "Revert jump rework"""

This reverts commit 1fe80bb1d957cddb9318796f9a57b529e7830f6d.