SQUASHME: backport fix for #1668