Reverted previous commit, since it does more damage than good on Linux...