Revert the XWT bump and bump md-addins again