Backport to squeeze