revert bbdb-uuid-related changes
Merge branch 'suggest-v3.x' into debian-v3.x