Revert "Aether II"

This reverts commit 845819346a7b53a4cb6e4ca3c792406d4370ee06.
Revert "Revert "Aether II""

This reverts commit 43e423a1567b504c363c8d8fe0f3a39d184e4156.