backport changes to extract based system.

aufs was too much bother, as it was difficult to umoun