Revert "fix Makefile to use $(USER).mk for machine/user specific parameters"

This reverts commit 4c60290507c49c9019662e7d773645df8561f011.