Revert "async_hooks: ensure proper handling in runInAsyncScope"

This reverts commit a9fad85.

lib/async_hooks.js

@@ -21,6 +21,7 @@ const {
   executionAsyncId,
   triggerAsyncId,
   // Private API
+  hasAsyncIdStack,
   getHookArrays,
   enableHooks,
   disableHooks,
@@ -171,13 +172,14 @@ class AsyncResource {
   runInAsyncScope(fn, thisArg, ...args) {
     const asyncId = this[async_id_symbol];
     emitBefore(asyncId, this[trigger_async_id_symbol]);
-
-    const ret = thisArg === undefined ?
-      fn(...args) :
-      ReflectApply(fn, thisArg, args);
-
-    emitAfter(asyncId);
-    return ret;
+    try {
+      if (thisArg === undefined)
+        return fn(...args);
+      return ReflectApply(fn, thisArg, args);
+    } finally {
+      if (hasAsyncIdStack())
+        emitAfter(asyncId);
+    }
   }
 
   emitDestroy() {