Update to match changes made in r205955