This is a resubmission of the original patch from D255. Sorry, I didn’t understand that subsequent patches added to a diff are considered to override previous ones, rather than add to them.
Basically the comment for commit rB554eca1c288e has been applied to the wrong patch.