Backed out changeset 77d3d487c68d (bug 943021) for bustage.
CLOSED TREE