If you really don't like the new PR, you should really be petitioning to remove the OP code entirely. That's what most of you seem to actually be arguing for.