remove intrusive patch, proper fix is [5820], Makefile cleanup