one more point :) this removes support for files inside 'file' subfolders of folders from environment variables, so this is backwards incompatible