Add auto-hot-swap back in