This patchset cleanly applies to the current rust-team, just trying to figure out how to resend the series with a different base, sorry for the delay