Revert "Switching to long polling"

This reverts commit eeb530828a963792dd728aa59740b9f03a468c79.