Revert "ATR/Orbwalker Fix"

This reverts commit 373577e69f36e6fd2685ec4bd7b3c20702590551.