Revert changes to the main Makefile