Bug 890179. r=seth a=abillings