diff --git a/platformio/builder/scripts/atmelavr.py b/platformio/builder/scripts/atmelavr.py
index b60ef381..188029d0 100644
--- a/platformio/builder/scripts/atmelavr.py
+++ b/platformio/builder/scripts/atmelavr.py
@@ -54,8 +54,8 @@ def BeforeUpload(target, source, env):  # pylint: disable=W0613,W0621
 
 
 env = DefaultEnvironment()
-env = SConscript(env.subst(join("$PIOBUILDER_DIR", "scripts", "baseavr.py")),
-                 exports="env")
+
+SConscript(env.subst(join("$PIOBUILDER_DIR", "scripts", "baseavr.py")))
 
 env.Replace(
     UPLOADER=join("$PIOPACKAGES_DIR", "tool-avrdude", "avrdude"),
diff --git a/platformio/builder/scripts/atmelsam.py b/platformio/builder/scripts/atmelsam.py
index 568ce4f9..e098e371 100644
--- a/platformio/builder/scripts/atmelsam.py
+++ b/platformio/builder/scripts/atmelsam.py
@@ -16,8 +16,8 @@ def BeforeUpload(target, source, env):  # pylint: disable=W0613,W0621
 
 
 env = DefaultEnvironment()
-env = SConscript(env.subst(join("$PIOBUILDER_DIR", "scripts", "basearm.py")),
-                 exports="env")
+
+SConscript(env.subst(join("$PIOBUILDER_DIR", "scripts", "basearm.py")))
 
 env.Replace(
     UPLOADER=join("$PIOPACKAGES_DIR", "$PIOPACKAGE_UPLOADER", "bossac"),
diff --git a/platformio/builder/scripts/basearm.py b/platformio/builder/scripts/basearm.py
index d265ee1e..a5912786 100644
--- a/platformio/builder/scripts/basearm.py
+++ b/platformio/builder/scripts/basearm.py
@@ -5,10 +5,9 @@
     Base for ARM microcontrollers.
 """
 
-from SCons.Script import Builder, Import, Return
+from SCons.Script import Builder, DefaultEnvironment
 
-env = None
-Import("env")
+env = DefaultEnvironment()
 
 env.Replace(
     AR="arm-none-eabi-ar",
@@ -104,5 +103,3 @@ env.Append(
         )
     )
 )
-
-Return("env")
diff --git a/platformio/builder/scripts/baseavr.py b/platformio/builder/scripts/baseavr.py
index ad7da418..3164de91 100644
--- a/platformio/builder/scripts/baseavr.py
+++ b/platformio/builder/scripts/baseavr.py
@@ -5,10 +5,9 @@
     Base for Atmel AVR series of microcontrollers
 """
 
-from SCons.Script import Builder, Import, Return
+from SCons.Script import Builder, DefaultEnvironment
 
-env = None
-Import("env")
+env = DefaultEnvironment()
 
 env.Replace(
     AR="avr-ar",
@@ -92,5 +91,3 @@ env.Append(
         )
     )
 )
-
-Return("env")
diff --git a/platformio/builder/scripts/digistump.py b/platformio/builder/scripts/digistump.py
index 6820857b..dbe540c5 100644
--- a/platformio/builder/scripts/digistump.py
+++ b/platformio/builder/scripts/digistump.py
@@ -18,10 +18,9 @@ def BeforeUpload(target, source, env):  # pylint: disable=W0613,W0621
 
 env = DefaultEnvironment()
 
-if "cortex" in env.get("BOARD_OPTIONS").get("build").get("cpu"):
-    env = SConscript(
-        env.subst(join("$PIOBUILDER_DIR", "scripts", "basearm.py")),
-        exports="env")
+if "cortex" in env.get("BOARD_OPTIONS", {}).get("build", {}).get("cpu", ""):
+    SConscript(env.subst(join("$PIOBUILDER_DIR", "scripts", "basearm.py")))
+
     env.Replace(
         UPLOADER=join("$PIOPACKAGES_DIR", "$PIOPACKAGE_UPLOADER", "bossac"),
         UPLOADERFLAGS=[
@@ -48,8 +47,8 @@ if "cortex" in env.get("BOARD_OPTIONS").get("build").get("cpu"):
         ]
     )
 else:
-    env = SConscript(env.subst(
-        join("$PIOBUILDER_DIR", "scripts", "baseavr.py")), exports="env")
+    SConscript(env.subst(join("$PIOBUILDER_DIR", "scripts", "baseavr.py")))
+
     env.Replace(
         UPLOADER=join("$PIOPACKAGES_DIR", "tool-micronucleus", "micronucleus"),
         UPLOADERFLAGS=[
@@ -71,7 +70,7 @@ target_elf = env.BuildFirmware(["m"] + CORELIBS)
 # Target: Build the firmware file
 #
 
-if "cortex" in env.get("BOARD_OPTIONS").get("build").get("cpu"):
+if "cortex" in env.get("BOARD_OPTIONS", {}).get("build", {}).get("cpu", ""):
     if "uploadlazy" in COMMAND_LINE_TARGETS:
         target_firm = join("$BUILD_DIR", "firmware.bin")
     else:
diff --git a/platformio/builder/scripts/frameworks/arduino.py b/platformio/builder/scripts/frameworks/arduino.py
index 6d3a8538..5fb45c86 100644
--- a/platformio/builder/scripts/frameworks/arduino.py
+++ b/platformio/builder/scripts/frameworks/arduino.py
@@ -8,10 +8,9 @@
 from os import listdir, walk
 from os.path import isfile, join
 
-from SCons.Script import Import, Return
+from SCons.Script import DefaultEnvironment, Return
 
-env = None
-Import("env")
+env = DefaultEnvironment()
 
 BOARD_OPTS = env.get("BOARD_OPTIONS", {})
 BOARD_BUILDOPTS = BOARD_OPTS.get("build", {})
@@ -179,4 +178,4 @@ if env.subst("${PLATFORMFW_DIR}")[-3:] == "sam":
         join("$PLATFORMFW_DIR", "system", "libsam", "source")
     ))
 
-Return("env libs")
+Return("libs")
diff --git a/platformio/builder/scripts/frameworks/cmsis.py b/platformio/builder/scripts/frameworks/cmsis.py
index 3dbdb0f4..4af5b98a 100644
--- a/platformio/builder/scripts/frameworks/cmsis.py
+++ b/platformio/builder/scripts/frameworks/cmsis.py
@@ -7,10 +7,9 @@
 
 from os.path import join
 
-from SCons.Script import Import, Return
+from SCons.Script import DefaultEnvironment, Return
 
-env = None
-Import("env")
+env = DefaultEnvironment()
 
 env.Replace(
     PLATFORMFW_DIR=join("$PIOPACKAGES_DIR", "framework-cmsis")
@@ -40,4 +39,4 @@ libs.append(envsafe.BuildLibrary(
     join("$PLATFORMFW_DIR", "variants", "${BOARD_OPTIONS['build']['variant']}")
 ))
 
-Return("env libs")
+Return("libs")
diff --git a/platformio/builder/scripts/frameworks/energia.py b/platformio/builder/scripts/frameworks/energia.py
index 3d1547fc..a4f72a63 100644
--- a/platformio/builder/scripts/frameworks/energia.py
+++ b/platformio/builder/scripts/frameworks/energia.py
@@ -7,10 +7,9 @@
 
 from os.path import join
 
-from SCons.Script import Import, Return
+from SCons.Script import DefaultEnvironment, Return
 
-env = None
-Import("env")
+env = DefaultEnvironment()
 
 env.Replace(
     PLATFORMFW_DIR=join("$PIOPACKAGES_DIR", "framework-energia${PLATFORM[2:]}")
@@ -53,4 +52,4 @@ libs.append(env.BuildLibrary(
     join("$PLATFORMFW_DIR", "cores", "${BOARD_OPTIONS['build']['core']}")
 ))
 
-Return("env libs")
+Return("libs")
diff --git a/platformio/builder/scripts/frameworks/opencm3.py b/platformio/builder/scripts/frameworks/opencm3.py
index 324e2c32..5742429c 100644
--- a/platformio/builder/scripts/frameworks/opencm3.py
+++ b/platformio/builder/scripts/frameworks/opencm3.py
@@ -9,12 +9,11 @@ import re
 from os import listdir, sep, walk
 from os.path import isfile, join, normpath
 
-from SCons.Script import Import, Return
+from SCons.Script import DefaultEnvironment, Return
 
 from platformio.util import exec_command
 
-env = None
-Import("env")
+env = DefaultEnvironment()
 
 env.Replace(
     PLATFORMFW_DIR=join("$PIOPACKAGES_DIR", "framework-opencm3")
@@ -169,4 +168,4 @@ libs.append(env.Library(
     get_source_files(root_dir)
 ))
 
-Return("env libs")
+Return("libs")
diff --git a/platformio/builder/scripts/frameworks/spl.py b/platformio/builder/scripts/frameworks/spl.py
index 170d004b..ee19fc0c 100644
--- a/platformio/builder/scripts/frameworks/spl.py
+++ b/platformio/builder/scripts/frameworks/spl.py
@@ -7,10 +7,9 @@
 
 from os.path import join
 
-from SCons.Script import Import, Return
+from SCons.Script import DefaultEnvironment, Return
 
-env = None
-Import("env")
+env = DefaultEnvironment()
 
 env.Replace(
     PLATFORMFW_DIR=join("$PIOPACKAGES_DIR", "framework-spl")
@@ -62,4 +61,4 @@ libs.append(envsafe.BuildLibrary(
     ignore_files
 ))
 
-Return("env libs")
+Return("libs")
diff --git a/platformio/builder/scripts/stm32.py b/platformio/builder/scripts/stm32.py
index 433400c7..4cd991af 100644
--- a/platformio/builder/scripts/stm32.py
+++ b/platformio/builder/scripts/stm32.py
@@ -12,8 +12,8 @@ from SCons.Script import (COMMAND_LINE_TARGETS, AlwaysBuild, Default,
                           DefaultEnvironment, SConscript)
 
 env = DefaultEnvironment()
-env = SConscript(env.subst(join("$PIOBUILDER_DIR", "scripts", "basearm.py")),
-                 exports="env")
+
+SConscript(env.subst(join("$PIOBUILDER_DIR", "scripts", "basearm.py")))
 
 env.Replace(
     UPLOADER=join("$PIOPACKAGES_DIR", "tool-stlink", "st-flash"),
diff --git a/platformio/builder/scripts/teensy.py b/platformio/builder/scripts/teensy.py
index 24ef8b2d..9f96c7ff 100644
--- a/platformio/builder/scripts/teensy.py
+++ b/platformio/builder/scripts/teensy.py
@@ -13,12 +13,9 @@ from SCons.Script import (COMMAND_LINE_TARGETS, AlwaysBuild, Default,
 env = DefaultEnvironment()
 
 if env.get("BOARD_OPTIONS", {}).get("build", {}).get("core") == "teensy":
-    env = SConscript(env.subst(
-        join("$PIOBUILDER_DIR", "scripts", "baseavr.py")), exports="env")
-
+    SConscript(env.subst(join("$PIOBUILDER_DIR", "scripts", "baseavr.py")))
 elif env.get("BOARD_OPTIONS", {}).get("build", {}).get("core") == "teensy3":
-    env = SConscript(env.subst(
-        join("$PIOBUILDER_DIR", "scripts", "basearm.py")), exports="env")
+    SConscript(env.subst(join("$PIOBUILDER_DIR", "scripts", "basearm.py")))
 
 env.Append(
     CPPDEFINES=[
diff --git a/platformio/builder/scripts/titiva.py b/platformio/builder/scripts/titiva.py
index a8b4041c..b96d4b70 100644
--- a/platformio/builder/scripts/titiva.py
+++ b/platformio/builder/scripts/titiva.py
@@ -12,8 +12,8 @@ from SCons.Script import (COMMAND_LINE_TARGETS, AlwaysBuild, Default,
                           DefaultEnvironment, SConscript)
 
 env = DefaultEnvironment()
-env = SConscript(env.subst(join("$PIOBUILDER_DIR", "scripts", "basearm.py")),
-                 exports="env")
+
+SConscript(env.subst(join("$PIOBUILDER_DIR", "scripts", "basearm.py")))
 
 env.Replace(
     UPLOADER=join("$PIOPACKAGES_DIR", "tool-lm4flash", "lm4flash"),
diff --git a/platformio/builder/tools/platformio.py b/platformio/builder/tools/platformio.py
index 149018eb..6fe231b0 100644
--- a/platformio/builder/tools/platformio.py
+++ b/platformio/builder/tools/platformio.py
@@ -27,11 +27,10 @@ def ProcessGeneral(env):
             env.ConvertInoToCpp()
         for f in env['FRAMEWORK'].split(","):
             SConscriptChdir(0)
-            env, libs = SConscript(
-                env.subst(join("$PIOBUILDER_DIR", "scripts",
-                               "frameworks", "%s.py" % f.strip().lower())),
-                exports="env")
-            corelibs += libs
+            corelibs += SConscript(
+                env.subst(join("$PIOBUILDER_DIR", "scripts", "frameworks",
+                               "%s.py" % f.strip().lower()))
+            )
     return corelibs
 
 
@@ -341,7 +340,7 @@ def AutodetectUploadPort(env):
     if "UPLOAD_PORT" not in env:
         for item in get_serialports():
             if "VID:PID" in item['hwid']:
-                print ("Auto-detected UPLOAD_PORT: %s" % item['port'])
+                print "Auto-detected UPLOAD_PORT: %s" % item['port']
                 env.Replace(UPLOAD_PORT=item['port'])
                 break