undo Makefile changes, to allow upstream