reverted the S3Sink changes