Revert "Merge branch 'Logan' into AutoTest"

This reverts commit 93476621b429a81fa8383f2841434fc8e8377f61, reversing
changes made to ff8f6ee7a042b3942a740ad3e8c54d9d723a4b51.