Bug 847310 - Yet another bustage fix. a=bustage