Revert "import changes"

This reverts commit 9b2a4cb.

Author: m0mosenpai

client/commands/v2/__init__.py

@@ -3,7 +3,6 @@
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
-from ..v2 import pysa_server  # noqa F401
 from . import backend_arguments  # noqa F401
 from . import check  # noqa F401
 from . import coverage  # noqa F401
@@ -13,6 +12,7 @@
 from . import kill  # noqa F401
 from . import persistent  # noqa F401
 from . import profile  # noqa F401
+from . import pysa_server  # noqa F401
 from . import query  # noqa F401
 from . import rage  # noqa F401
 from . import restart  # noqa F401

client/tests/pyre_test.py

@@ -10,10 +10,10 @@
 
 import testslide
 
-from ...client import pyre
 from .. import (
     command_arguments,
     configuration,
+    pyre,
     recently_used_configurations,
 )
 from .setup import (