This line here breaks backwards compatibility, however. :(