diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out /tmp/cirrus-ci-build/build/testrun/regress/regress/results/create_index.out
--- /tmp/cirrus-ci-build/src/test/regress/expected/create_index.out	2024-04-24 19:47:46.652754558 +0000
+++ /tmp/cirrus-ci-build/build/testrun/regress/regress/results/create_index.out	2024-04-24 19:49:57.844726951 +0000
@@ -2135,11 +2135,19 @@
 --
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{1,42,7}'::integer[])) AND (unique1 = ANY ('{7,8,9}'::integer[])))
-(2 rows)
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = 7) OR (unique1 = 8) OR (unique1 = 9))
+   Filter: (unique1 = ANY ('{1,42,7}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 7)
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 8)
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = 9)
+(10 rows)
 
 SELECT unique1 FROM tenk1 WHERE unique1 IN (1, 42, 7) and unique1 = ANY('{7, 8, 9}');
  unique1 
@@ -2149,11 +2157,17 @@
 
 explain (costs off)
 SELECT unique1 FROM tenk1 WHERE unique1 = ANY('{7, 14, 22}') and unique1 = ANY('{33, 44}'::bigint[]);
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Index Only Scan using tenk1_unique1 on tenk1
-   Index Cond: ((unique1 = ANY ('{7,14,22}'::integer[])) AND (unique1 = ANY ('{33,44}'::bigint[])))
-(2 rows)
+                               QUERY PLAN                               
+------------------------------------------------------------------------
+ Bitmap Heap Scan on tenk1
+   Recheck Cond: ((unique1 = '33'::bigint) OR (unique1 = '44'::bigint))
+   Filter: (unique1 = ANY ('{7,14,22}'::integer[]))
+   ->  BitmapOr
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = '33'::bigint)
+         ->  Bitmap Index Scan on tenk1_unique1
+               Index Cond: (unique1 = '44'::bigint)
+(8 rows)
 
 SELECT unique1 FROM tenk1 WHERE unique1 = ANY('{7, 14, 22}') and unique1 = ANY('{33, 44}'::bigint[]);
  unique1