Ok, we decided to fix this, but in a subsequent PR.