Merge "restore setup.cfg in case submitted by mistake"