Backed out changeset d4251829067b (bug 948265) for bustage.
CLOSED TREE