This reverts commit 56dba36eb5bc783c314d0fa627585cab42cebe7a.
This fails on hydra on x86_64 for unknown reason.