BACKLOG-3698 : reverted code