Reverting r23593 due to a regression bug ESBJAVA-3106