Revert "Merge branch 'Issue591' into Issue496ToMergeWithSGMReleaseToMergeWithNewXRFDetector"

This reverts commit 370580e9db9fbf9f64952fe01bce0a564e5b6b2c, reversing
changes made to aa83498d898c991679a53e831f2841f9261511d8.