Recommitting parts of r48130. These do not appear to cause the observed failures.