Issue #3227240: Reverting the refactoring associated with eliminiating dependencies on abandoned 3rd party packages