Merge "Revert "Fix braino in Makefile.""