catchup: disable auto-catchup for now; handle disconnect better