This reverts commit 3229c971512404c512e041c3e88f22dbec2b650b. With a2acac6 in place this should provide enough info to work out any repeat of the failure in cross_ovver_uniform_dist.test.