The amount of code needed to add this feature back in if needed is small, so why don't we just simplify the PR and remove that option for now, and then we can add it back and make a case for it if we have a concrete reason to use it in our repo.