Revert "move back onto mainline tobi@0.3.2 which has required fixes"

This reverts commit cb3639b72ff9110e75f34ae77d746e06bf501017.