diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py
index 950fe723dcfd..fccbedb519d7 100644
--- a/meta/lib/oe/patch.py
+++ b/meta/lib/oe/patch.py
@@ -4,7 +4,6 @@
 
 import oe.path
 import oe.types
-import subprocess
 
 class NotFoundError(bb.BBHandledException):
     def __init__(self, path):
@@ -26,6 +25,7 @@ class CmdError(bb.BBHandledException):
 
 def runcmd(args, dir = None):
     import pipes
+    import subprocess
 
     if dir:
         olddir = os.path.abspath(os.curdir)
@@ -56,7 +56,6 @@ def runcmd(args, dir = None):
         if dir:
             os.chdir(olddir)
 
-
 class PatchError(Exception):
     def __init__(self, msg):
         self.msg = msg
@@ -299,19 +298,6 @@ class GitApplyTree(PatchTree):
         PatchTree.__init__(self, dir, d)
         self.commituser = d.getVar('PATCH_GIT_USER_NAME')
         self.commitemail = d.getVar('PATCH_GIT_USER_EMAIL')
-        if not self._isInitialized():
-            self._initRepo()
-
-    def _isInitialized(self):
-        cmd = "git rev-parse --show-toplevel"
-        (status, output) = subprocess.getstatusoutput(cmd.split())
-        ## Make sure repo is in builddir to not break top-level git repos
-        return status == 0 and os.path.samedir(output, self.dir)
-
-    def _initRepo(self):
-        runcmd("git init".split(), self.dir)
-        runcmd("git add .".split(), self.dir)
-        runcmd("git commit -a --allow-empty -m Patching_started".split(), self.dir)
 
     @staticmethod
     def extractPatchHeader(patchfile):
diff --git a/meta/lib/oeqa/selftest/cases/bbtests.py b/meta/lib/oeqa/selftest/cases/bbtests.py
index e2b9290200ac..487568c907e5 100644
--- a/meta/lib/oeqa/selftest/cases/bbtests.py
+++ b/meta/lib/oeqa/selftest/cases/bbtests.py
@@ -298,21 +298,6 @@ INHERIT:remove = \"report-error\"
         test_recipe_summary_after = get_bb_var('SUMMARY', test_recipe)
         self.assertEqual(expected_recipe_summary, test_recipe_summary_after)
 
-    def test_git_patchtool(self):
-        """ PATCHTOOL=git should work with non-git sources like tarballs
-            test recipe for the test must NOT containt git:// repository in SRC_URI
-        """
-        test_recipe = "man-db"
-        self.write_recipeinc(test_recipe, 'PATCHTOOL=\"git\"')
-        src = get_bb_var("SRC_URI",test_recipe)
-        gitscm = re.search("git://", src)
-        self.assertFalse(gitscm, "test_git_patchtool pre-condition failed: {} test recipe contains git repo!".format(test_recipe))
-        result = bitbake('man-db -c patch', ignore_status=False)
-        fatal = re.search("fatal: not a git repository (or any of the parent directories)", result.output)
-        self.assertFalse(fatal, "Failed to patch using PATCHTOOL=\"git\"")
-        self.delete_recipeinc(test_recipe)
-        bitbake('-cclean man-db')
-
     def test_git_unpack_nonetwork(self):
         """
         Test that a recipe with a floating tag that needs to be resolved upstream doesn't