Bug 961676. r=rstrong. a=abillings