Revert 3b98b0e..6ca7ebe

This rolls back to commit 3b98b0e30a8598028e96fa20fe950b100ca8969f.
Working jump limit