diff --git a/python/ycm/client/completion_request.py b/python/ycm/client/completion_request.py
index afc17a5d..0e444316 100644
--- a/python/ycm/client/completion_request.py
+++ b/python/ycm/client/completion_request.py
@@ -43,8 +43,8 @@ class CompletionRequest( BaseRequest ):
     if not self._response_future:
       return []
     try:
-      return [ _ConvertCompletionDataToVimData( x )
-               for x in JsonFromFuture( self._response_future ) ]
+      return _ConvertCompletionResponseToVimDatas(
+          JsonFromFuture( self._response_future ) )
     except Exception as e:
       vimsupport.PostVimMessage( str( e ) )
     return []
@@ -67,3 +67,8 @@ def _ConvertCompletionDataToVimData( completion_data ):
     vim_data[ 'info' ] = ToUtf8IfNeeded( completion_data[ 'detailed_info' ] )
 
   return vim_data
+
+
+def _ConvertCompletionResponseToVimDatas( response_data ):
+  return [ _ConvertCompletionDataToVimData( x )
+           for x in response_data[ 'completions' ] ]
diff --git a/third_party/ycmd b/third_party/ycmd
index 94f793db..fc7abe89 160000
--- a/third_party/ycmd
+++ b/third_party/ycmd
@@ -1 +1 @@
-Subproject commit 94f793db7bff7a1ff9a3ba6855828e22afb3d52c
+Subproject commit fc7abe8948c0dc279cd2a5dd6b5595cb2a2172e3