Build extra packages only when we need it!