Revert "AtE setup, Try 2, Part 2"

This reverts commit cee7cbc7b74f9f718ade36141d12e8bf0cca5a17.