Backout 6c79ec580eec in an attempt to find a Tp regression (Bug 1088669)