This reverts commit 05a1fe1362. For some reason, the rootfile changes introduced with this patch break the build, as they do not seem to be present. Needs further investigation.
05a1fe1362