Revert removal of bobby, it breaks unit tests