diff --git a/HISTORY.rst b/HISTORY.rst
index b00fde2d..86130c76 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -7,8 +7,6 @@ PlatformIO 3.0
 3.5.2 (2018-??-??)
 ~~~~~~~~~~~~~~~~~~
 
-* Upgraded build system to `SCons <http://scons.org>`__ 3.0
-  (`issue #895 <https://github.com/platformio/platformio-core/issues/895>`_)
 * Added aliases (off, light, strict) for
   `LDF Compatibility Modes <http://docs.platformio.org/page/librarymanager/ldf.html>`__
 * Show device system information (MCU, Frequency, RAM, Flash, Debugging tools)
diff --git a/platformio/managers/core.py b/platformio/managers/core.py
index c417fb4b..1de8aa5f 100644
--- a/platformio/managers/core.py
+++ b/platformio/managers/core.py
@@ -25,7 +25,7 @@ CORE_PACKAGES = {
     "contrib-pysite": ">=0.1.2,<2",
     "tool-pioplus": ">=0.13.3,<2",
     "tool-unity": "~1.20302.1",
-    "tool-scons": ">=3.30000.0,<4"
+    "tool-scons": "~2.20501.3"
 }
 
 PIOPLUS_AUTO_UPDATES_MAX = 100
diff --git a/platformio/managers/package.py b/platformio/managers/package.py
index 29761195..905b756a 100644
--- a/platformio/managers/package.py
+++ b/platformio/managers/package.py
@@ -478,7 +478,7 @@ class PkgInstallerMixin(object):
                     target_dirname = "%s@src-%s" % (
                         pkg_dirname,
                         hashlib.md5(cur_manifest['__src_url']).hexdigest())
-                os.rename(pkg_dir, join(self.package_dir, str(target_dirname)))
+                os.rename(pkg_dir, join(self.package_dir, target_dirname))
             # fix to a version
             elif action == 2:
                 target_dirname = "%s@%s" % (pkg_dirname,