Revert Makefile changes as they did not work as intended