Revert ca 114341

Experimental revert to fix stress test.