Oops. Unbreak the 9.1 build.

I forgot to "git add" latest changes after backpatching the changes
for previous commit.