Revert "ConsistencyCheck now waits for indexes to populate."

This reverts commit b30bc81b5d45f510258e90b3d1b013a365bf4d84.