Unbreak Makefile build after r174216