Move deprecated api back into new