I'll open a separate PR where we can fix that and we can rebase this PR on top of it when it's merged.