Backout 80a69108ae62 in an attempt to find a Tp regression (Bug 1088669)