Backed out changeset 5ecccdf09f33 (bug 1007223) for bustage.
CLOSED TREE