Revert 14915 and 14916

src/objects.cc

Index: src/objects.cc
diff --git a/src/objects.cc b/src/objects.cc
index f914e15dd00e60909b1f86fd024b641db6bd9c20..c94a6972118a3f8f767555e6736b2774ada1d8e6 100644
--- a/src/objects.cc
+++ b/src/objects.cc
@@ -344,8 +344,6 @@ MaybeObject* JSObject::GetPropertyWithCallback(Object* receiver,
     {
       // Leaving JavaScript.
       VMState<EXTERNAL> state(isolate);
-      ExternalCallbackScope call_scope(isolate,
-                                       v8::ToCData<Address>(fun_obj));
       result = args.Call(call_fun, v8::Utils::ToLocal(key));
     }
     RETURN_IF_SCHEDULED_EXCEPTION(isolate);
@@ -2791,8 +2789,6 @@ MaybeObject* JSObject::SetPropertyWithCallback(Object* structure,
     {
       // Leaving JavaScript.
       VMState<EXTERNAL> state(isolate);
-      ExternalCallbackScope call_scope(isolate,
-                                       v8::ToCData<Address>(call_obj));
       args.Call(call_fun,
                 v8::Utils::ToLocal(key),
                 v8::Utils::ToLocal(value_handle));