diff --git a/test/src/unit-capi-config.cc b/test/src/unit-capi-config.cc
index 5d8ce36f3f6..04fa1fde00c 100644
--- a/test/src/unit-capi-config.cc
+++ b/test/src/unit-capi-config.cc
@@ -727,7 +727,6 @@ TEST_CASE("C API: Test config iter", "[capi][config]") {
all_param_values["vfs.s3.connect_timeout_ms"] = "10800";
all_param_values["vfs.s3.connect_max_tries"] = "5";
all_param_values["vfs.s3.connect_scale_factor"] = "25";
- all_param_values["vfs.s3.custom_headers."] = "";
all_param_values["vfs.s3.sse"] = "";
all_param_values["vfs.s3.sse_kms_key_id"] = "";
all_param_values["vfs.s3.logging_level"] = "Off";
@@ -796,7 +795,6 @@ TEST_CASE("C API: Test config iter", "[capi][config]") {
vfs_param_values["s3.connect_timeout_ms"] = "10800";
vfs_param_values["s3.connect_max_tries"] = "5";
vfs_param_values["s3.connect_scale_factor"] = "25";
- vfs_param_values["s3.custom_headers."] = "";
vfs_param_values["s3.sse"] = "";
vfs_param_values["s3.sse_kms_key_id"] = "";
vfs_param_values["s3.logging_level"] = "Off";
@@ -860,7 +858,6 @@ TEST_CASE("C API: Test config iter", "[capi][config]") {
s3_param_values["connect_timeout_ms"] = "10800";
s3_param_values["connect_max_tries"] = "5";
s3_param_values["connect_scale_factor"] = "25";
- s3_param_values["custom_headers."] = "";
s3_param_values["sse"] = "";
s3_param_values["sse_kms_key_id"] = "";
s3_param_values["logging_level"] = "Off";
diff --git a/tiledb/api/c_api/config/config_api_external.h b/tiledb/api/c_api/config/config_api_external.h
index 38edcbf019b..ef0308a79e1 100644
--- a/tiledb/api/c_api/config/config_api_external.h
+++ b/tiledb/api/c_api/config/config_api_external.h
@@ -480,7 +480,7 @@ TILEDB_EXPORT void tiledb_config_free(tiledb_config_t** config) TILEDB_NOEXCEPT;
* The scale factor for exponential backoff when connecting to S3.
* Any `long` value is acceptable.
* **Default**: 25
- * - `vfs.s3.custom_headers.`
+ * - `vfs.s3.custom_headers.*`
* (Optional) Prefix for custom headers on s3 requests. For each custom
* header, use "vfs.s3.custom_headers.header_key" = "header_value"
* **Optional. No Default**
diff --git a/tiledb/sm/config/config.cc b/tiledb/sm/config/config.cc
index 70831474a44..ea4d25740e1 100644
--- a/tiledb/sm/config/config.cc
+++ b/tiledb/sm/config/config.cc
@@ -211,7 +211,6 @@ const std::string Config::VFS_S3_CA_PATH = "";
const std::string Config::VFS_S3_CONNECT_TIMEOUT_MS = "10800";
const std::string Config::VFS_S3_CONNECT_MAX_TRIES = "5";
const std::string Config::VFS_S3_CONNECT_SCALE_FACTOR = "25";
-const std::string Config::VFS_S3_CUSTOM_HEADERS_;
const std::string Config::VFS_S3_SSE = "";
const std::string Config::VFS_S3_SSE_KMS_KEY_ID = "";
const std::string Config::VFS_S3_REQUEST_TIMEOUT_MS = "3000";
@@ -457,7 +456,6 @@ const std::map default_config_values = {
"vfs.s3.connect_max_tries", Config::VFS_S3_CONNECT_MAX_TRIES),
std::make_pair(
"vfs.s3.connect_scale_factor", Config::VFS_S3_CONNECT_SCALE_FACTOR),
- std::make_pair("vfs.s3.custom_headers.", Config::VFS_S3_CUSTOM_HEADERS_),
std::make_pair("vfs.s3.sse", Config::VFS_S3_SSE),
std::make_pair("vfs.s3.sse_kms_key_id", Config::VFS_S3_SSE_KMS_KEY_ID),
std::make_pair(
diff --git a/tiledb/sm/config/config.h b/tiledb/sm/config/config.h
index 5bc5b3965f9..3453ef13916 100644
--- a/tiledb/sm/config/config.h
+++ b/tiledb/sm/config/config.h
@@ -529,12 +529,6 @@ class Config {
/** Connect scale factor for exponential backoff. */
static const std::string VFS_S3_CONNECT_SCALE_FACTOR;
- /**
- * Prefix for custom headers on s3 requests. Each custom header should be set
- * with syntax VFS_S3_CUSTOM_HEADERS_KEY = "VALUE"
- */
- static const std::string VFS_S3_CUSTOM_HEADERS_;
-
/** S3 server-side encryption algorithm. */
static const std::string VFS_S3_SSE;
diff --git a/tiledb/sm/cpp_api/config.h b/tiledb/sm/cpp_api/config.h
index 5dbd8a120ed..02c66b180d1 100644
--- a/tiledb/sm/cpp_api/config.h
+++ b/tiledb/sm/cpp_api/config.h
@@ -658,7 +658,7 @@ class Config {
* The scale factor for exponential backofff when connecting to S3.
* Any `long` value is acceptable.
* **Default**: 25
- * - `vfs.s3.custom_headers.`
+ * - `vfs.s3.custom_headers.*`
* (Optional) Prefix for custom headers on s3 requests. For each custom
* header, use "vfs.s3.custom_headers.header_key" = "header_value"
* **Optional. No Default**
diff --git a/tiledb/sm/filesystem/s3.h b/tiledb/sm/filesystem/s3.h
index 2b0b02eed53..b359c0f288a 100644
--- a/tiledb/sm/filesystem/s3.h
+++ b/tiledb/sm/filesystem/s3.h
@@ -133,7 +133,7 @@ struct S3Parameters {
, connect_max_tries_(
config.get("vfs.s3.connect_max_tries", Config::must_find))
, connect_scale_factor_(config.get(
- "vfs.s3.connect_scale_factor", Config::must_find))]
+ "vfs.s3.connect_scale_factor", Config::must_find))
, custom_headers_(load_headers(config))
, logging_level_(
config.get("vfs.s3.logging_level", Config::must_find))