diff --git a/platformio/__init__.py b/platformio/__init__.py
index 469a4e79..e06d38ef 100644
--- a/platformio/__init__.py
+++ b/platformio/__init__.py
@@ -14,7 +14,7 @@
 
 import sys
 
-VERSION = (3, 0, "0.dev18")
+VERSION = (3, 0, "0.dev19")
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"
diff --git a/platformio/commands/upgrade.py b/platformio/commands/upgrade.py
index 9a8f8dbf..93f82e6c 100644
--- a/platformio/commands/upgrade.py
+++ b/platformio/commands/upgrade.py
@@ -43,8 +43,6 @@ def cli():
         r = None
         try:
             for cmd in cmds:
-                if sys.version_info < (2, 7, 0):
-                    cmd[0] += ".__main__"
                 cmd = [os.path.normpath(sys.executable), "-m"] + cmd
                 r = None
                 r = util.exec_command(cmd)
diff --git a/platformio/ide/projectgenerator.py b/platformio/ide/projectgenerator.py
index 762dfbc4..ecd2f868 100644
--- a/platformio/ide/projectgenerator.py
+++ b/platformio/ide/projectgenerator.py
@@ -63,11 +63,7 @@ class ProjectGenerator(object):
         envdata = self.get_project_env()
         if "env_name" not in envdata:
             return data
-        cmd = [
-            normpath(sys.executable), "-m",
-            "platformio" + (".__main__"
-                            if sys.version_info < (2, 7, 0) else ""), "-f"
-        ]
+        cmd = [normpath(sys.executable), "-m", "platformio", "-f"]
         if app.get_session_var("caller_id"):
             cmd.extend(["-c", app.get_session_var("caller_id")])
         cmd.extend(["run", "-t", "idedata", "-e", envdata['env_name']])