2.9.3 compatibility.