Bug 951268 - Fix bustage. a=bustage