Wrong locking style got merged from 1.4 to trunk. My mistake.