put Makefile changes back