Use the long branch

This is a difference between RISC and CISC. Had no idea that there
was a long branch. So get rid of the "hack" we used.