[patch] switch back to Owersun's MFC implementation