Revert what wasn't linked to the makefile breaking frenzy