Merge "Revert "Fix OOM throwing if it happens in finalizer reference""