(I think) this fixed the broken-build problem.