trying to track down whalesong bugs
Revert "trying to track down whalesong bugs"

This reverts commit d6fbf9c4108ebaceb62163f734e33f954f2e5112.

This stuff is now on the whalesong-tests branch