Backout 2100e058cc97 in an attempt to find a Tp regression (Bug 1088669)