Restoring 3.2 compatibility.
Restore 2.x compatibility.