diff --git a/python/ycm/youcompleteme.py b/python/ycm/youcompleteme.py
index cc60e3a8..67110bf8 100644
--- a/python/ycm/youcompleteme.py
+++ b/python/ycm/youcompleteme.py
@@ -318,10 +318,7 @@ class YouCompleteMe( object ):
   def OnBufferUnload( self, deleted_buffer_file ):
     if not self.IsServerAlive():
       return
-    SendEventNotificationAsync(
-      'BufferUnload',
-      filepath = deleted_buffer_file,
-      extra_data = { 'unloaded_buffer': deleted_buffer_file } )
+    SendEventNotificationAsync( 'BufferUnload', filepath = deleted_buffer_file )
 
 
   def OnBufferVisit( self ):
diff --git a/third_party/ycmd b/third_party/ycmd
index fbc28d2e..c3daaacd 160000
--- a/third_party/ycmd
+++ b/third_party/ycmd
@@ -1 +1 @@
-Subproject commit fbc28d2e17af4c843b75bb4659baaab7a23d1d9c
+Subproject commit c3daaacd28decaf8250ee7feaa956d0519eaa52d