Make a best effort at pre-2.5 compatibility.
2 files changed