Let's try to fix agent-build (part 2)