Backed out changeset 290f4be587a1 (bug 983489) for suspicion that this caused the m8 and m10 on ics debug on a CLOSED TREE