Oh, you should also add a comment or reference to #4409 here so that others can understand why we do that.