Bug 970307: fix non-unified build bustage. r=me