Revert "Merge branch '21.9-ATLITKSW-114' into '21.9'"

Nicholas Stylesrequested to merge
revert-00871f48 into 21.9

This reverts merge request !32189 (merged)

Reverting until changes to digitization and reconstruction for existing geometries can be understood.

Merge request reports