Follow-up to bug 1073081 - Fix the non-unified build bustage