Fix Linux by partially reverting 196787