Backout the temp patch in bug 1011391 for not helping. r=bz

This may have also caused a spike in CC time.