Revert "s3: Fix bug 8371"