Another build fix attempt.