This is the line that breaks backwards-compatibility; there's no getting around it with this implementation.