Revert the code that assumed that incoming parameters used a random generation