Bug 984467 - Hopeful bustage fix. a=bustage