Reintroduce workaround for /etc in root if files go to /usr