Backed out changeset 1840b15583fd (bug 636564) for bustage.
CLOSED TREE