HOPKINS: Partially revert 63b669cfc4ec0cae7be83949f98ee3fd48607f90 as it causes a regression in ComputerManager