Bug 867056. r=rstrong. a=akeybl