Revert "Nasty hard-coded dep builds"

This reverts commit 369d80e933b2559af0bc740121d68f1078b75439.