BACKLOG-923 Reverted some differences with original code #2