Tweak homesick bootstrap for idempotence