diff --git a/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/Linker.cs b/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/Linker.cs
index 941b4c07851..d2d3752c5a9 100644
--- a/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/Linker.cs
+++ b/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/Linker.cs
@@ -8,6 +8,7 @@
 using Mono.Cecil.Mdb;
 using Mono.Tuner;
 using Mono.Cecil;
+using Mono.Cecil.Cil;
 using MonoTouch.Tuner;
 
 namespace MonoDroid.Tuner
@@ -45,8 +46,8 @@ static LinkContext CreateLinkContext (LinkerOptions options, Pipeline pipeline)
 			context.LogInternalExceptions = Xamarin.Android.Tasks.MonoAndroidHelper.LogInternalExceptions;
 			context.CoreAction = AssemblyAction.Link;
 			context.LinkSymbols = true;
-			context.SymbolReaderProvider = new MdbReaderProvider ();
-			context.SymbolWriterProvider = new MdbWriterProvider ();
+			context.SymbolReaderProvider = new DefaultSymbolReaderProvider (true);
+			context.SymbolWriterProvider = new DefaultSymbolWriterProvider ();
 			context.OutputDirectory = options.OutputDirectory;
 			return context;
 		}