I agree with @mdboom on the behavior here.  I haven't looked at the code change, but the new test is what I would expect and looks good.