Make the Makefile great again after r211570, r211572