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