Backport skimage issue #1101