Bug 913492. r=khuey, a=blocking-leo+