This may have been explained in the previous pull request, but why have these been turned into build-time dependencies in head? They're no longer needed at run time?