I'm not sure this is functionally different from what there was previously. Is this what you were suggesting in your comment on this PR @jmfee?