diff --git a/libs/gui/BufferHubProducer.cpp b/libs/gui/BufferHubProducer.cpp
index 70321ca..061710a 100644
--- a/libs/gui/BufferHubProducer.cpp
+++ b/libs/gui/BufferHubProducer.cpp
@@ -26,12 +26,6 @@
 
 /* static */
 sp<BufferHubProducer> BufferHubProducer::Create(const std::shared_ptr<ProducerQueue>& queue) {
-    if (queue->metadata_size() != sizeof(DvrNativeBufferMetadata)) {
-        ALOGE("BufferHubProducer::Create producer's metadata size is different "
-              "than the size of DvrNativeBufferMetadata");
-        return nullptr;
-    }
-
     sp<BufferHubProducer> producer = new BufferHubProducer;
     producer->queue_ = queue;
     return producer;
diff --git a/libs/gui/BufferQueue.cpp b/libs/gui/BufferQueue.cpp
index 1988690..2917f45 100644
--- a/libs/gui/BufferQueue.cpp
+++ b/libs/gui/BufferQueue.cpp
@@ -113,8 +113,7 @@
 
     dvr::ProducerQueueConfigBuilder configBuilder;
     std::shared_ptr<dvr::ProducerQueue> producerQueue =
-            dvr::ProducerQueue::Create(configBuilder.SetMetadata<DvrNativeBufferMetadata>().Build(),
-                                       dvr::UsagePolicy{});
+            dvr::ProducerQueue::Create(configBuilder.Build(), dvr::UsagePolicy{});
     LOG_ALWAYS_FATAL_IF(producerQueue == NULL, "BufferQueue: failed to create ProducerQueue.");
 
     std::shared_ptr<dvr::ConsumerQueue> consumerQueue = producerQueue->CreateConsumerQueue();
diff --git a/libs/gui/tests/SurfaceParcelable_test.cpp b/libs/gui/tests/SurfaceParcelable_test.cpp
index 99a8a7a..686dc82 100644
--- a/libs/gui/tests/SurfaceParcelable_test.cpp
+++ b/libs/gui/tests/SurfaceParcelable_test.cpp
@@ -49,7 +49,6 @@
         mProducerQueue = dvr::ProducerQueue::Create(configBuilder.SetDefaultWidth(kBufferWidth)
                                                             .SetDefaultHeight(kBufferHeight)
                                                             .SetDefaultFormat(kBufferFormat)
-                                                            .SetMetadata<DvrNativeBufferMetadata>()
                                                             .Build(),
                                                     dvr::UsagePolicy{});
         mBufferHubProducer = BufferHubProducer::Create(mProducerQueue);
diff --git a/libs/vr/libbufferhubqueue/tests/buffer_hub_queue_producer-test.cpp b/libs/vr/libbufferhubqueue/tests/buffer_hub_queue_producer-test.cpp
index 3e96989..4f10f83 100644
--- a/libs/vr/libbufferhubqueue/tests/buffer_hub_queue_producer-test.cpp
+++ b/libs/vr/libbufferhubqueue/tests/buffer_hub_queue_producer-test.cpp
@@ -94,9 +94,7 @@
     ALOGD_IF(TRACE, "Begin test: %s.%s", testInfo->test_case_name(),
              testInfo->name());
 
-    auto config = ProducerQueueConfigBuilder()
-                      .SetMetadata<DvrNativeBufferMetadata>()
-                      .Build();
+    auto config = ProducerQueueConfigBuilder().Build();
     auto queue = ProducerQueue::Create(config, UsagePolicy{});
     ASSERT_TRUE(queue != nullptr);
 
diff --git a/libs/vr/libdvr/tests/dvr_buffer_queue-test.cpp b/libs/vr/libdvr/tests/dvr_buffer_queue-test.cpp
index 301458a..5d9d8b5 100644
--- a/libs/vr/libdvr/tests/dvr_buffer_queue-test.cpp
+++ b/libs/vr/libdvr/tests/dvr_buffer_queue-test.cpp
@@ -221,7 +221,7 @@
 TEST_F(DvrBufferQueueTest, GetANativeWindow) {
   int ret = api_.WriteBufferQueueCreate(
       kBufferWidth, kBufferHeight, kBufferFormat, kLayerCount, kBufferUsage,
-      /*capacity=*/0, sizeof(DvrNativeBufferMetadata), &write_queue_);
+      /*capacity=*/0, /*user_metadata_size=*/0, &write_queue_);
   ASSERT_EQ(0, ret);
   ASSERT_NE(nullptr, write_queue_);