Another 1.5.2 build fix attempt