I'm pretty sure this still breaks backwards compatibility.