reorg so that jumping isn't a side effect of deactivating what we've done