Bug 981676 - Fix backout of bugs 980438/962103. r=mfinkle