[skip-changelog] builder: refactor utils functions #2344
+396
−534
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.