Restore old files that were causing compiling issues