This reverts commitac2e2f8883. It causes a regression ("std::bad_variant_access in load_view_build_progress"). Commit2978052113(a reindent) is also reverted as part of the process. Fixes #12395
This reverts commitac2e2f8883. It causes a regression ("std::bad_variant_access in load_view_build_progress"). Commit2978052113(a reindent) is also reverted as part of the process. Fixes #12395