diff --git a/system/vulkan/goldfish_vulkan.cpp b/system/vulkan/goldfish_vulkan.cpp
index 6aaea57..7d42df7 100644
--- a/system/vulkan/goldfish_vulkan.cpp
+++ b/system/vulkan/goldfish_vulkan.cpp
@@ -31,10 +31,6 @@
 // Copied from frameworks/native/vulkan/libvulkan/stubhal.cpp
 namespace vkstubhal {
 
-[[noreturn]] VKAPI_ATTR void NoOp() {
-    LOG_ALWAYS_FATAL("invalid stub function called");
-}
-
 VkResult
 EnumerateInstanceExtensionProperties(const char* /*layer_name*/,
                                      uint32_t* count,
@@ -264,12 +260,8 @@
     if (strcmp(name, "vkGetBufferCollectionPropertiesFUCHSIA") == 0)
         return reinterpret_cast<PFN_vkVoidFunction>(GetBufferCollectionPropertiesFUCHSIA);
 #endif
-    // Per the spec, return NULL if instance is NULL.
-    if (!instance)
-        return nullptr;
-    // None of the other Vulkan functions should ever be called, as they all
-    // take a VkPhysicalDevice or other object obtained from a physical device.
-    return reinterpret_cast<PFN_vkVoidFunction>(NoOp);
+    // Per the spec, return NULL for nonexistent entrypoints.
+    return nullptr;
 }
 
 } // namespace vkstubhal