Revert "Merge branch 'feature-NXCALS-3746-deprecated-class-causing-conflicts' into 'develop'"
#Merge request template @acc-logging-team - please have a look for approval.
Please describe the merge request here.
#Merge request template @acc-logging-team - please have a look for approval.
Please describe the merge request here.