revert test speedup attempt