Update migration to new 2.5 api (for real)