Bug 1013172 - Fix bustage, r=bustage