This reverts commit 467269a1.

This is just a temporary revert until there is no failures
to build. Right now it fails with :
OSError: [Errno 2] No such file or directory