We were pining Y then removing the pin for X. When X == Y, we'd remove the new
pin.

fixes #6648