ticket:1 Makefile tempfix - revert