[3.1.x] Revert "Prevent mountpoint collision between ephemeral drive and shar…

[eantonin]

This reverts commit fe7d847.

Description of changes

• Reverting is needed because using this commit will need to backport other parts of code, which we don't want to touch

Tests

No tests needed

Checklist

• Make sure you are pointing to the right branch and add a label in the PR title (i.e. 2.x vs 3.x)
• Check all commits' messages are clear, describing what and why vs how.
• Make sure to have added unit tests or integration tests to cover the new/modified code.
• Check if documentation is impacted by this change.

Please review the guidelines for contributing and Pull Request Instructions.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.