Revert "Fix specs failed by random order"

This reverts commit 5c0335c06925756e12462c2257b31bea506c14ca.