Revert all recent configure changes related to dependency resolution