Reverted to a FinalRandom version that is a direct copy of the original.