Restore 1.8 compatibility.