Bug 989947 followup bustage fix, a=RyanVM