Revert "Revert "we no longer need those fish hacks""

doesn't really help... :(

This reverts commit fb3af9609d7b8137380d2c6a2db43ae0b2db609f.