Reverted to the old main Makefile.