Try to be graceful when dealing with existing code using the old API.