Revert makefile changes since there will be no external tooling around that anymore