Restoring the Aether upgrade

This reverts commit 77b1c3651788314cc386ad13e9edcf2e8e94bc36.