I thought about it, if we do that, I'll need to fix the bunch of code it replaces, also having it in this commit provides some context as to why it was done. You make the call, I'll update the PR accordingly.