Backed out changeset 83e8b0ff394c (Bug 1081268) for Octane Mandreel regression.