Back out 5bd9db528aed (issue #18408).  It caused unsolved buildbot failures.
2 files changed