Move types back to the 2.5 API.