Revert previous patch, I meant to open a PR