Use the new zuul patch for a cleaner makefile.