So, I discovered this inconsistency whilst working on this bug and discussed it with Kaira, but it seems the person that needs to make the call is chofmann and I am still awaiting his feedback. With that, I did not want to just go ahead and change this now but, it should not prevent the PR from being merged and the current bug closed.