Backed out changeset b15db5d459d3 (bug 1029559)