Changing back core files

--Morteza