Further reverting of  commit a603537
Strange file copy happened somewhere