See my comment on the PR about hating this entire block and looking for replacements, good point too