Fixes a test which was broken on the green dragon buildbot, and further failures on the SIE buildbot. This reverts commit 8df9eff9.