Bug 25033: (follow-up) Don't delete branchcode key from suggestion_ref