Hear, hear. It doesn't usually come back on upgrades for me, but every time I setup on a new device it is annoying to have to remove.