This reverts commit 18ff65644e. Image with that change fails to build with some obscure errors with file access.
18ff65644e