Bug 18501: (follow-up) Add fallback to ItemHomeBranch