Get rid of bastard duff's device at the cost of a few more jumps