This breaks backwards compatibility.