WaRP7 builds broken since repo changes