Switch to old method