revert some of the changes to avoid regression on ProgressIndicator