if it's not just flakiness, landing a fix (whatever that looks like) would be appreciated.