--- usr/src/nv/nvacpi.c.orig	2015-06-11 15:03:09.273321219 +0000
+++ usr/src/nv/nvacpi.c	2015-06-11 15:03:50.763320674 +0000
@@ -257,14 +257,6 @@
             "NVRM: nv_acpi_remove: failed to disable display switch events (%d)!\n", status);
     }
 
-    if (pNvAcpiObject->notify_handler_installed)
-    {
-        NV_ACPI_OS_WAIT_EVENTS_COMPLETE();
-
-        // remove event notifier
-        status = acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY, nv_acpi_event);
-    }
-
     if (pNvAcpiObject->notify_handler_installed &&
         ACPI_FAILURE(status))
     {