Getting rid of one more ref to old API