I've made a PR for this: #2397.