Backed out changeset 279d7f0290da (bug 1017903)