This reverts commit 869b86d925a9e2e592e0a6385908faa186eace77. It breaks tarball evaluation, see 869b86d925
869b86d925