This new version shold prevent crashing on the linux buildbots.