Thanks to David Smith for investigation and review. Co-authored-by: Carlton Gibson <carlton.gibson@noumenal.es> Backport of d976c254fc76e5f04d81dfd9d142c58e933c9c92 from master
Thanks to David Smith for investigation and review. Co-authored-by: Carlton Gibson <carlton.gibson@noumenal.es> Backport of d976c254fc76e5f04d81dfd9d142c58e933c9c92 from master