reverted/commented out previous change as doesn't work - something to be
worked on with a jira ticket