diff --git a/.travis.yml b/.travis.yml
index 0c653e66..44e5035e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -129,7 +129,6 @@ jobs:
 
   - name: "macOS"
     os: osx
-    osx_image: xcode10.1
     env:
     - INSTALL_DIR="sfizz-${TRAVIS_BRANCH}-${TRAVIS_OS_NAME}-${TRAVIS_CPU_ARCH}"
     install: .travis/install_osx.sh
diff --git a/cmake/SfizzConfig.cmake b/cmake/SfizzConfig.cmake
index 2b4886a1..52a2a587 100644
--- a/cmake/SfizzConfig.cmake
+++ b/cmake/SfizzConfig.cmake
@@ -1,10 +1,3 @@
-if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND (CMAKE_CXX_STANDARD LESS 14 OR NOT CMAKE_CXX_STANDARD))
-    # There is a strange segfault in clang in c++11 when instantiating the
-    # envelopes in FloatEnvelopes.cpp.
-    message("Forcing C++14 to bypass a clang segfault")
-    set(CMAKE_CXX_STANDARD 14)
-endif()
-
 # Do not override the C++ standard if set to more than 11
 if (NOT CMAKE_CXX_STANDARD OR CMAKE_CXX_STANDARD LESS 11)
     set(CMAKE_CXX_STANDARD 11)