Finish with the adaptivity reorganization for now.