Revert commit 131781, to see if it fixes the x86-64 dragonegg buildbot.