Change for 2.9.x compatibility.