revert bbdb-uuid-related changes