Revert to generic makefile