Adapt to the new structure of bob with bob/bob on top.
bob/bob
assigned to @ydayer
merged
mentioned in commit da429f3e