`s3_protocol` now returns the protocol without a colon. If you need a
colon, you can pass in `true` as a second argument.

This might not be a best solution, so any better patch that does not
introduce a regression is welcome.

Fixes #921