Hopefully will give us some insight into the spurious failures. Follow-up from afba53f0f168365a9540a8c8bb39e85a44e0249c.