Revert "random no repeat fix"

This reverts commit 0846b8754e839108da93f20fa8137881ad93472f.
random no repeat fix
merge conflict