Backed out changeset 66a520c18efe (bug 1008590) for octane-mandreel regression.