Backport #543 workaround in 2.4
Merge branch '2.4' of github.com:FasterXML/jackson-databind into 2.4