I thought this change already went into master as part of 8e5967b9541d41ac62779ae2dd29b42e60441674. I'm a bit confused why it shows up again in this PR.