Revert temporary Makefile changes