Re-apply workaround for Chaotic Æther