We have this nice function to do all the work, and we're not even using it...

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Accidentally killed a }

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #1440 from Oldiesmann/release-2.1

We have this nice function and we're not even using it