Fix for bug 31374: reintroduce recursive unstrip as in r27667, somehow omitted during...