No longer need to require patch #11032 because it’s now in git master.
Adapt to a services api change.