Add timeout back into s3 connection

Fixes #11735.