ARIES-669 : Fix bug from patch that causes us to miss some JSR/RET instructions - undo incorrect change and commit real fix