Wrong bucket value when using VPCE

[refre5h]

Issue
When using VPCE, the URL would be something like this: https://s3.<region>.amazonaws.com/<bucket name>.bucket.vpce-<###>-<###>/<key>. With this URL, the value of the bucket returned by amazon-s3-uri is everything before the <key>, which is <bucket name>.bucket.vpce-<###>-<###>.

Expected
When using VPCE, the value of the bucket should just be <bucket name>