Yes, that is true. I've made the relevant changes in my own branch.