Backed out changeset e01dbdf8a218 (bug 1016613)