This reverts commit ceafd896f5b801b4722f81b869c27ea2ed3870dd.
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).