Apparently it still works with the legacy ones (since the xd-shell tests use those). A separate PR would be more manageable IMO.