Update for API change in r215391