Revert last RandomSource change - bug