Fix s3 version restore for keeping current version
Merge pull request #1236 from njam/issue-1236

Fix s3 version restore for keeping current version