Adjust to new async API.