Sneaky. Very sneaky. And as a consequence something that I am not willing to merge as-is.

In the *very* least, this hunk needs a rationale in the commit message that I must have missed.