PM: put s3 check back in