Revert "aries: fix #ifdefs derp"

This reverts commit 534f556599c24e139941fff9b8eb8df59b93fff8.