Co-authored-by: Carlton Gibson <carlton.gibson@noumenal.es> Backport of 9e4b1ad33e436e8fe60af756d7e09639ee886ac2 from master