Backed out changeset b56f9bccea92 (bug 1017257)