Update to reflect API changes in r171367.