Yes, we can remove this. There is a pull request already: #1834.