Bug 965982. r=bent, a=1.2.x+