Bug 983157: Backout bug 980647 (31844306c2f1, dcd632ee9a3e). r=backout