Revert "Merge branch 'fishAgent' of https://github.com/dhpollock/fwf into fishAgent"

This reverts commit 8d3d64d783556e0f1ded1d59928dc769cbf92824, reversing
changes made to b6031b1350fcc63e89b6c6b786bc1c0bbf005689.