Yep, I wanted to remove the old method at first but that would make it easier to backport if needed.