Make buildset snapshot generation work again