Revert "Updated for COWOA 2.6"

This reverts commit 01071924eba0a59b9eb727569ef5d8e328f3285c.