Revert the makefile breaking frenzy for further testing