diff --git a/R/components.R b/R/components.R
index bd8a0bbb785..d8ce0ff51e1 100644
--- a/R/components.R
+++ b/R/components.R
@@ -323,45 +323,9 @@ bridges <- function(graph) {
 #' @cdocs igraph_biconnected_components
 biconnected_components <- function(graph) {
   # Function call
-  res <- biconnected_components_impl(
+  biconnected_components_impl(
     graph = graph
   )
-
-  # TODO: Clean up after fixing "." / "_" problem.
-  # See https://github.com/igraph/rigraph/issues/1203
-
-  if (igraph_opt("return.vs.es")) {
-    res$tree_edges <- lapply(
-      res$tree_edges,
-      unsafe_create_es,
-      graph = graph,
-      es = E(graph)
-    )
-    res$tree.edges <- NULL
-  }
-
-  if (igraph_opt("return.vs.es")) {
-    res$component_edges <- lapply(
-      res$component_edges,
-      unsafe_create_es,
-      graph = graph,
-      es = E(graph)
-    )
-    res$component.edges <- NULL
-  }
-  if (igraph_opt("return.vs.es")) {
-    res$components <- lapply(
-      res$components,
-      unsafe_create_vs,
-      graph = graph,
-      verts = V(graph)
-    )
-  }
-  if (igraph_opt("return.vs.es")) {
-    res$articulation_points <- create_vs(graph, res$articulation_points)
-    res$articulation.points <- NULL
-  }
-  res
 }
 
 #' Check biconnectedness
diff --git a/tools/stimulus/functions-R.yaml b/tools/stimulus/functions-R.yaml
index f88aaa9f1aa..bcfefe9f361 100644
--- a/tools/stimulus/functions-R.yaml
+++ b/tools/stimulus/functions-R.yaml
@@ -878,6 +878,12 @@ igraph_adhesion:
 igraph_cohesion:
     IGNORE: RR, RC
 
+igraph_biconnected_components:
+    PARAM_NAMES:
+        tree_edges: tree_edges
+        component_edges: component_edges
+        articulation_points: articulation_points
+
 #######################################
 # Listing s-t cuts, separators
 #######################################