innocent-looking patch that breaks oot-builds

[Justus Winter]

Hi,

here is the innocent-looking patch that breaks out of tree builds.
Any thoughts how to fix this?

Justus