It's becoming a persistent issue, even on master