Backed out changeset 92f37b7106a4 (bug 970769) on a CLOSED TREE r=bustage