Revert "Revert "ATR/Orbwalker Fix""

This reverts commit 660ac3a1ad8d1d8bc51be17c5cc2bc41b07ba2f3.