Re-add MXi without git subrepo