Backed out changeset 64c58cb9c49b (bug 918078) for bustage