simplify and remove requirement for X-POLLING-REQUEST