Bug 1062801 - Fix non-unified build bustage.