Attempt fix of #11557 by changing teardown logic.
1 file changed