Could you refactor this commit to minimize the noise? We've got lots of people looking at this patch to evaluate the severity of ORM 4.3 not being backwards compatible.