LP#1676608: properly auto-override during missing checkout