Move more code back to 2.5 APIs.