Fix issue 11108 again (fixup pull #1598)