Backed out changeset 5f2a4049b9e9 (bug 1089753)