Backed out changeset 1d72742584ad (bug 945614) per Bug 853356 comment 209
Bug 853356: backout p1
Bug 853356: backout p2
Bug 853356: backout p3