Initial 2.4.4 compatibility.