Backed out changeset 3ca7edf8fb5b (bug 1007223) for bustage.