squash with debian mainline commit