A patch to address issues raised in bug#22695.