Bug 1024289 - Part 0c: follow-up to fix bustage. r=trivial