We might still need these for something... (fixes #2618)

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

We might still need these for something... (fixes #2618)