Backed out changeset 061a225551cb (bug 1013558) for bustage.
CLOSED TREE