Revert "Merge branch 'lohenry-fixCrossTalk' into 'master'"

This reverts merge request !595 (merged)

as it causes green boxes in lhcb-master to become red for Boole and it is also affecting some test mismatch in 2024-patches

Note that new reference in !597 (closed) have been made for !595 (merged) and can be investigated.

cc: @zexu