Yes. I think this should be changed, but probably in a different PR since it might effect more code.