Bug 860235: fix bustage r=dustin