CAAERS-7069  - reverting based on comments from Paul in JIRA