This reverts commit 61fb70c386. Reported in #5183 to break the build. Further investigation needed.
61fb70c386