To truly resolve https://github.com/apache/datafusion/issues/16004 as a followup to https://github.com/apache/datafusion/pull/16530
