Backed out changeset 4d2cefab5e0f (bug 960864) CLOSED TREE