backout changeset 3435c5865cfc due to buildbot failures. Ref #8797
merge 3.4; backout changeset 3435c5865cfc due to buildbot failures. Ref #8797