Proper fix for EZRSS, issue #984 , previous fix actually totally broke EZRSS. See comment in a791b3f.
Merge pull request #998 from miigotu/fix-ezrss

Proper fix for EZRSS, issue #984 , previous fix actually totally broke EZRSS