Draft: Revert "Identical data handles are not identical"

This reverts merge request !4682 (merged), as the data handles are not identical, and that is still a problem. Hence reverting the hack that makes them look identical, in order to allow debugging the underlying problem, instead of hiding it...