These patches need to be upstreamed but in the mean time, let's make sure new releases have working serial :)