Trying for 5.3.3 compatibility.