diff --git a/src/dawn/native/vulkan/UtilsVulkan.cpp b/src/dawn/native/vulkan/UtilsVulkan.cpp
index b1ab45c..aa02ec3 100644
--- a/src/dawn/native/vulkan/UtilsVulkan.cpp
+++ b/src/dawn/native/vulkan/UtilsVulkan.cpp
@@ -209,7 +209,28 @@
                           uint64_t objectHandle,
                           const char* prefix,
                           std::string label) {
-    // Implementation removed due to crbug.com/dawn/1539.
+    if (!objectHandle) {
+        return;
+    }
+
+    if (device->GetGlobalInfo().HasExt(InstanceExt::DebugUtils)) {
+        VkDebugUtilsObjectNameInfoEXT objectNameInfo;
+        objectNameInfo.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_NAME_INFO_EXT;
+        objectNameInfo.pNext = nullptr;
+        objectNameInfo.objectType = objectType;
+        objectNameInfo.objectHandle = objectHandle;
+
+        std::ostringstream objectNameStream;
+        // Prefix with the device's message ID so that if this label appears in a validation
+        // message it can be parsed out and the message can be associated with the right device.
+        objectNameStream << device->GetDebugPrefix() << kDeviceDebugSeparator << prefix;
+        if (!label.empty() && device->IsToggleEnabled(Toggle::UseUserDefinedLabelsInBackend)) {
+            objectNameStream << "_" << label;
+        }
+        std::string objectName = objectNameStream.str();
+        objectNameInfo.pObjectName = objectName.c_str();
+        device->fn.SetDebugUtilsObjectNameEXT(device->GetVkDevice(), &objectNameInfo);
+    }
 }
 
 std::string GetNextDeviceDebugPrefix() {
