reverting the two commits to fix the makefile