Indeed. I have not changed this part of the old PR.