Fold private function back into calling function

Fold private function back into calling function

This function is not logically separated from the calling function - it used
to be shared code but now is private & called from one place.
This moves the code back into the calling function. All the variables have the same name
in both places