JAL-3049 redo (part of) commit 92bc328