Backout rev 4fe82d0824d1 (bug 946658) for suspected Tp5 regression. r=me