Revert "Merge branch 'Progress-Status'"

This reverts commit b7972b173bdfd8cbcfb9e7fa5c7733913d9f76e5, reversing
changes made to 778df8385edb3f442e2eaf0f5e5eaeac4cc02f86.