Revert loop routing hotfix