Reverting Dan changes in Makefile - they do not work