Bug 1028187 - Follow-up to fix build bustage r=bustage