This reverts commit ceafd896f5.
ceafd896f5
This has the benefit of being able to override all the inputs to the build where you were previously only able to override the entire package set (if at all).