FLEX-34108 Change to simpler implementation. On 10.2/10.3 no issue as the function shouldn't be called directly.