Bug 869836 followup to fix build bustage