This change should not appear in this PR. Also, I don't agree with it, so please remove it, and let's discuss this in another PR.