We haven't needed these lately. If we see more problems that need diagnosis "in the wild" then we can revert this commit. (imported from commit 3885183d08aefa1f7fd7aa8c2c060e917bf215fb)