Revert upstream changes, fixed location concact tmp file naming, made removal of default config an option