Merge pull request #13946 from kpayson64/fix_on_1_8

Fix stall bug with pollhup workaround