diff --git a/src/add-ons/media/media-add-ons/mixer/Jamfile b/src/add-ons/media/media-add-ons/mixer/Jamfile
index 6cbe852076..201e4a2f6e 100644
--- a/src/add-ons/media/media-add-ons/mixer/Jamfile
+++ b/src/add-ons/media/media-add-ons/mixer/Jamfile
@@ -12,7 +12,6 @@ Addon mixer.media_addon :
 	MixerSettings.cpp
 	MixerUtils.cpp
 	Resampler.cpp
-	ResamplerSmooth.cpp
 	: be media
 ;
 
diff --git a/src/add-ons/media/media-add-ons/mixer/MixerCore.cpp b/src/add-ons/media/media-add-ons/mixer/MixerCore.cpp
index 9463e9d64c..942bf36abe 100644
--- a/src/add-ons/media/media-add-ons/mixer/MixerCore.cpp
+++ b/src/add-ons/media/media-add-ons/mixer/MixerCore.cpp
@@ -10,8 +10,7 @@
 #include "MixerInput.h"
 #include "MixerOutput.h"
 #include "MixerUtils.h"
-//#include "Resampler.h"
-#include "ResamplerSmooth.h"
+#include "Resampler.h"
 #include "RtList.h"
 
 #include <Buffer.h>
@@ -262,15 +261,9 @@ MixerCore::ApplyOutputFormat()
 	}
 
 	fResampler = new Resampler * [fMixBufferChannelCount];
-#if 0
 	for (int i = 0; i < fMixBufferChannelCount; i++)
 		fResampler[i] = new Resampler(media_raw_audio_format::B_AUDIO_FLOAT, 
-			format.format);
-#else
-	for (int i = 0; i < fMixBufferChannelCount; i++)
-		fResampler[i] = new ResamplerSmooth(media_raw_audio_format::B_AUDIO_FLOAT, 
-			format.format);
-#endif
+										format.format);
 	
 	TRACE("MixerCore::OutputFormatChanged:\n");
 	TRACE("  fMixBufferFrameRate %ld\n", fMixBufferFrameRate);