This is what I meant as well, revert back to
the old and add a switch for the new method.