diff --git a/mongodb.spec b/mongodb.spec
index 954b893..6054926 100644
--- a/mongodb.spec
+++ b/mongodb.spec
@@ -41,7 +41,7 @@
 
 Name:           mongodb
 Version:        4.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        High-performance, schema-free document-oriented database
 Group:          Applications/Databases
 License:        AGPLv3 and zlib and ASL 2.0
@@ -78,8 +78,9 @@ Patch1:         python3-buildscripts-tests.patch
 # Enable ppc64 big endian support
 Patch20:         ppc64.patch
 # Add support also for 32bit platforms
+# + set default storage engine for non 64-bit arches - RHBZ#1303846
 Patch21:         32bit-support.patch
-# Generate code for ppc64, arm and i386 arches
+# Generate mozjs code for ppc64, arm and i386 arches
 Patch23:         ppc64-arm-i386-mozjs-code.patch
 
 BuildRequires:  gcc-c++ >= 5.3.0
@@ -220,17 +221,12 @@ sed -i -r "s|/data/db|%{_datadir}/%{pkg_name}-test/var|"   buildscripts/resmokel
 
 sed -i -r "s|env python|env python3|" buildscripts/resmoke.py
 
-# set default storage engine for non 64-bit arches - RHBZ#1303846
-%ifnarch %{upstream_arches} ppc64
-sed -i 's|engine = "wiredTiger"|engine = "mmapv1"|' src/mongo/db/storage/storage_options.h
-%endif
-
 
 %build
 export LANG="en_US.UTF-8"
 # Prepare variables for building
 cat > variables.list << EOF
-CCFLAGS="$(echo %{?optflags} | sed -e "s/-O. //" -e "s/-g //") -fvisibility=hidden"
+CCFLAGS="$(echo %{?optflags} | sed -e "s/-O. //" -e "s/-g //")"
 LINKFLAGS="%{?__global_ldflags} -Wl,-z,noexecstack -Wl,--reduce-memory-overheads,--no-keep-memory"
 VERBOSE=1
 MONGO_VERSION="%{version}"
@@ -373,8 +369,6 @@ sed -i "/session_catalog_migration_destination_test/d" build/unittests.txt
 sed -i "/connection_string_test/d" build/unittests.txt
 sed -i "/dns_query_test/d" build/unittests.txt
 sed -i "/mongo_uri_test/d" build/unittests.txt
-
-sed -i "/unittest_test/d" build/unittests.txt
 #TODO
 %ifarch %{ix86} %{arm}
 sed -i "/service_entry_point_mock_test/d" build/unittests.txt
@@ -514,6 +508,11 @@ fi
 
 
 %changelog
+* Wed Jul 11 2018 mskalick@redhat.com - 4.0.0-4
+- Follow upstream suggestion about unittest_test - SERVER-35935 jira ticket
+  (-fvisibility=hidden is not needed anymore, because bundled mozjs is used on
+  all arches)
+
 * Wed Jul 11 2018 mskalick@redhat.com - 4.0.0-3
 - Fix default storage engine for 32b arches