Back out e1549b50183f (bug 860027), suspected of regressing Trace Malloc and/or Ts Paint