Issue #16876: Revert be8e6b81284e, which wasn't thread-safe: wait until a

solution is found for poll().