You're right, that could work. I'll remove that patch from the PR.