backout changeset e0510a3bdf8f - due to buildbot failures. Ref: Issue #8797