Revert "Random bases fix"

This reverts commit 5fbb95d4ffb3bec48e6330b5155580bf76d7888a.