Revert "Salomon branch"

Reverts SalomonKoen/Jumpy_New#2