More recovery of reconnectibility in Zephyr.