Buildutils backport