Revert of Rework CallApi*Stubs.

src/ic/x87/handler-compiler-x87.cc

Index: src/ic/x87/handler-compiler-x87.cc
diff --git a/src/ic/x87/handler-compiler-x87.cc b/src/ic/x87/handler-compiler-x87.cc
index e1eea1af7a55f8fb32fe5ac23be36d2ff86393db..1b25f063473f6d8480232869c58540ac7af281ba 100644
--- a/src/ic/x87/handler-compiler-x87.cc
+++ b/src/ic/x87/handler-compiler-x87.cc
@@ -158,7 +158,7 @@
   // Stack now matches JSFunction abi.
   DCHECK(optimization.is_simple_api_call());
 
-  // Abi for CallApiCallbackStub.
+  // Abi for CallApiFunctionStub.
   Register callee = edi;
   Register data = ebx;
   Register holder = ecx;
@@ -220,7 +220,7 @@
   __ mov(api_function_address, Immediate(function_address));
 
   // Jump to stub.
-  CallApiCallbackStub stub(isolate, is_store, call_data_undefined,
+  CallApiAccessorStub stub(isolate, is_store, call_data_undefined,
                            !optimization.is_constant_call());
   __ TailCallStub(&stub);
 }