diff --git a/configure.ac b/configure.ac
index efa1943fc..413da26cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -536,8 +536,6 @@ AM_CONDITIONAL([WITH_OPENSSL], [test "x$ARG_ENABLE_ENCRYPTION" = "xyes" -o "x$AR
 AC_DEFINE([BOOST_ASIO_HASH_MAP_BUCKETS],[1021],[Define to fix a wrong behavior in boost 1.39.])
 COMPILETIME_OPTIONS="$COMPILETIME_OPTIONS -DBOOST_ASIO_HASH_MAP_BUCKETS=1021 "
 
-COMPILETIME_OPTIONS="$COMPILETIME_OPTIONS -msse4.2 "
-
 AC_DEFINE([BOOST_EXCEPTION_DISABLE],[1],[Define to disable the boost.exception features.])
 COMPILETIME_OPTIONS="$COMPILETIME_OPTIONS -DBOOST_EXCEPTION_DISABLE "
 
diff --git a/simulation/libsimulator b/simulation/libsimulator
index 5f7cbb8bd..0151d5c17 160000
--- a/simulation/libsimulator
+++ b/simulation/libsimulator
@@ -1 +1 @@
-Subproject commit 5f7cbb8bd222ed0e5cfdaffc2a2f5010fb5b4a29
+Subproject commit 0151d5c17fa3f4cf0ce518d0b8f90a23792c9b24