revert previous frandom module commit and re-cherry pick commit