Backport https://github.com/AztecProtocol/aztec-packages/pull/16187#discussion_r2346102172 to `v2`
Backport #16187 (comment) to
v2