Ok. Let me comment out the line, so that we can merge this. I will simply uncomment it for my builds for now, until this gets resolved robustly.