Get rid of deprecated function by inlineing it into its only caller:
- The code which I did not inline is already present at a higher nesting level in the function.