I would like to address this issue in a future patch, if that's ok with you. Since I am not changing the existing behavior, this seems like it deserves a separate bug+PR.