Unclear whether the old semantics were the right ones, but at least this preserves what they've been for the past however many years.