Xamarin went full derp->fix what was not broken in the first place