That'd change the behavior. Let's do it after the merge of this PR.