diff --git a/.travis/osx..install.sh b/.travis/osx..install.sh
index 3fb1df701fd..45a6762d1f5 100644
--- a/.travis/osx..install.sh
+++ b/.travis/osx..install.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-PACKAGES="cmake pkgconfig fftw libogg libvorbis lame libsndfile libsamplerate jack sdl libgig libsoundio stk portaudio node fltk"
+PACKAGES="cmake pkgconfig fftw libogg libvorbis lame libsndfile libsamplerate jack sdl libgig libsoundio stk fluid-synth portaudio node fltk"
 
 if [ $QT5 ]; then
 	PACKAGES="$PACKAGES qt5"
@@ -10,10 +10,4 @@ fi
 
 brew install $PACKAGES ccache
 
-# Recompile fluid-synth without CoreAudio per issues #649
-# Changes to fluid-synth.rb must be pushed to URL prior to use
-url=$(git remote get-url origin)
-branch=$(git symbolic-ref --short HEAD)
-brew install --build-from-source $url/raw/$branch/cmake/apple/fluid-synth.rb
-
 sudo npm install -g appdmg
diff --git a/cmake/apple/fluid-synth.rb b/cmake/apple/fluid-synth.rb
deleted file mode 100644
index d05fb4d6579..00000000000
--- a/cmake/apple/fluid-synth.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright (c) 2009-present, Homebrew contributors
-# License: BSD 2-Clause
-
-class FluidSynth < Formula
-  desc "Real-time software synthesizer based on the SoundFont 2 specs"
-  homepage "http://www.fluidsynth.org"
-  url "https://downloads.sourceforge.net/project/fluidsynth/fluidsynth-1.1.6/fluidsynth-1.1.6.tar.gz"
-  sha256 "50853391d9ebeda9b4db787efb23f98b1e26b7296dd2bb5d0d96b5bccee2171c"
-
-  bottle do
-    cellar :any
-    rebuild 1
-    sha256 "ee86f0e263db0610a340592d725bd2c05bc5ed1bfa6eb496ae304297de261ae0" => :sierra
-    sha256 "dfe31491d27c3c29ff4686900984e5884f89cd249d82b3dba4ad077f7bbe9057" => :el_capitan
-    sha256 "6938c03a61b696870de92435dc0a6e6118fbb0d68adcd0d17ec8d30c2f7eee20" => :yosemite
-    sha256 "5c5e00f88e45dd661c15f0e13793f9cc96f285b08200145ce8b77982350a5625" => :mavericks
-    sha256 "83b972cf7aec57e78dc1c1a6b3e286d8b9bf2a2622e174bca42efa8576e36e5f" => :mountain_lion
-  end
-
-  depends_on "pkg-config" => :build
-  depends_on "cmake" => :build
-  depends_on "glib"
-  depends_on "libsndfile" => :optional
-  depends_on "portaudio" => :optional
-
-  def install
-    args = std_cmake_args
-    args << "-Denable-framework=OFF" << "-DLIB_SUFFIX="
-    args << "-Denable-portaudio=ON" if build.with? "portaudio"
-    args << "-Denable-libsndfile=OFF" if build.without? "libsndfile"
-    args << "-Denable-coreaudio=OFF" # Per lmms/issues/649
-
-    mkdir "build" do
-      system "cmake", "..", *args
-      system "make", "install"
-    end
-  end
-
-  test do
-    assert_match /#{version}/, shell_output("#{bin}/fluidsynth --version")
-  end
-end
diff --git a/plugins/sf2_player/sf2_player.cpp b/plugins/sf2_player/sf2_player.cpp
index 1ff7a5ae65c..24551ac98de 100644
--- a/plugins/sf2_player/sf2_player.cpp
+++ b/plugins/sf2_player/sf2_player.cpp
@@ -113,6 +113,12 @@ sf2Instrument::sf2Instrument( InstrumentTrack * _instrument_track ) :
 		m_notesRunning[i] = 0;
 	}
 
+
+#if FLUIDSYNTH_VERSION_MAJOR >= 1 && FLUIDSYNTH_VERSION_MINOR >= 1 && FLUIDSYNTH_VERSION_MICRO >= 9
+	// Deactivate all audio drivers in fluidsynth
+	const char *none[] = { NULL };
+	fluid_audio_driver_register( none );
+#endif
 	m_settings = new_fluid_settings();
 
 	//fluid_settings_setint( m_settings, (char *) "audio.period-size", engine::mixer()->framesPerPeriod() );