diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/build/testrun/regress-running/regress/results/create_index.out
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2025-03-31 21:31:57.590656000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress-running/regress/results/create_index.out	2025-03-31 21:39:18.103892000 +0000
@@ -2012,7 +2012,7 @@
                                  QUERY PLAN                                 
 ----------------------------------------------------------------------------
  Aggregate
-   ->  Index Only Scan using tenk1_thous_tenthous on tenk1 t1
+   ->  Seq Scan on tenk1 t1
          Filter: ((thousand = 42) OR (thousand = (SubPlan 1)))
          SubPlan 1
            ->  Limit
@@ -2181,9 +2181,11 @@
                Filter: ((thousand = 42) OR (thousand = 41) OR (tenthous = 2))
                ->  Bitmap Index Scan on tenk2_hundred
                      Index Cond: (hundred = 42)
-         ->  Index Only Scan using tenk1_hundred on tenk1
-               Index Cond: (hundred = 42)
-(9 rows)
+         ->  Bitmap Heap Scan on tenk1
+               Recheck Cond: (hundred = 42)
+               ->  Bitmap Index Scan on tenk1_hundred
+                     Index Cond: (hundred = 42)
+(11 rows)
 
 EXPLAIN (COSTS OFF)
 SELECT count(*) FROM tenk1 JOIN tenk2 ON
@@ -2198,9 +2200,11 @@
                Filter: ((thousand = 42) OR (thousand = 41) OR (tenthous = 2))
                ->  Bitmap Index Scan on tenk2_hundred
                      Index Cond: (hundred = 42)
-         ->  Index Only Scan using tenk1_hundred on tenk1
-               Index Cond: (hundred = 42)
-(9 rows)
+         ->  Bitmap Heap Scan on tenk1
+               Recheck Cond: (hundred = 42)
+               ->  Bitmap Index Scan on tenk1_hundred
+                     Index Cond: (hundred = 42)
+(11 rows)
 
 EXPLAIN (COSTS OFF)
 SELECT count(*) FROM tenk1 LEFT JOIN tenk2 ON
@@ -2211,7 +2215,7 @@
  Aggregate
    ->  Nested Loop Left Join
          Join Filter: (tenk1.hundred = 42)
-         ->  Index Only Scan using tenk1_hundred on tenk1
+         ->  Seq Scan on tenk1
          ->  Memoize
                Cache Key: tenk1.hundred
                Cache Mode: logical
@@ -2253,11 +2257,15 @@
 SELECT unique1 FROM tenk1
 WHERE unique1 IN (1,42,7)
 ORDER BY unique1;
-                      QUERY PLAN                       
--------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: (unique1 = ANY ('{1,42,7}'::integer[]))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Sort
+   Sort Key: unique1
+   ->  Bitmap Heap Scan on tenk1
+         Recheck Cond: (unique1 = ANY ('{1,42,7}'::integer[]))
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = ANY ('{1,42,7}'::integer[]))
+(6 rows)
 
 SELECT unique1 FROM tenk1
 WHERE unique1 IN (1,42,7)
@@ -2368,11 +2376,13 @@
 
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 >= 42;
-                                 QUERY PLAN                                  
------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 >= 42))
-(2 rows)
+                                    QUERY PLAN                                     
+-----------------------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 >= 42))
+   ->  Bitmap Index Scan on tenk1_unique1
+         Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 >= 42))
+(4 rows)
 
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 >= 42;
  unique1 
@@ -2382,11 +2392,13 @@
 
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 > 42;
-                                 QUERY PLAN                                 
-----------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 > 42))
-(2 rows)
+                                    QUERY PLAN                                    
+----------------------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 > 42))
+   ->  Bitmap Index Scan on tenk1_unique1
+         Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 > 42))
+(4 rows)
 
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 > 42;
  unique1 
@@ -2409,18 +2421,20 @@
 
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 < 3 and unique1 <= 3;
-                    QUERY PLAN                    
---------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 < 3) AND (unique1 <= 3))
-(2 rows)
+                       QUERY PLAN                       
+--------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 < 3) AND (unique1 <= 3))
+   ->  Bitmap Index Scan on tenk1_unique1
+         Index Cond: ((unique1 < 3) AND (unique1 <= 3))
+(4 rows)
 
 SELECT unique1 FROM tenk1 WHERE unique1 < 3 and unique1 <= 3;
  unique1 
 ---------
-       0
-       1
        2
+       1
+       0
 (3 rows)
 
 explain (costs off)