Restore vpath'd builds