Bug 1110956 follow-up: Fix a build bustage on non-unified builds