Fixup for previous incomplete buildsys update