Revert "[Refactoring] Remove goto jumps"

This reverts commit 4e8d7a06e10afdb9742ce8c5d0d034d27cf95d5f.