Move over to DB/overlay-based state.