Backed out changeset 3a75155ac44d (bug 823789)