Revert to old Makefile now that it compiles