revert speedup, the wrapping causes fc insanity. the only reason this works today is that a new index is created in every setup/teardown, which also makes these tests slow...