This will break backwards compatibility.