This branch is for investigating the travis-only failures with the event subscription tests (e.g. travis builds 386 and 387).
No need to review yet!