Bug 919457: Followup to fix bustage. r=me