I don't think it is necessary to bundle a fix for that, especially when the semantics are not entirely clear, into this unrelated change.