Backed out changeset 5f0bfb16fa4a (bug 925605)