Build fix attempt #2.