Revert previous Linux-specific/centric commit#19629. If it really has to