Changes backported to Jackson 1.x