This reverts commit 7211d5ce07. This version fixes a crash that caused buildbot failures with the first version.
7211d5ce07