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