Update for non-unbundled builds, the library dep graph needs pruning