TUSCANY-3570 - Reverting previous changes from r948319 as they didn't seem to have any effect to the issue reported