Fix backwards-compatibility.