Revert "aquatic overhaul"

This reverts commit e0b6a41f6ae7c5f241ca9f54b88f9a1e5e2a017a.