This will break compatibility.