[DS-124] Wrong helper was generating wrong return URLs.