Bug 938341. r=smaug, a=abillings