Readd removed files from wrong merge.