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