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

See my comment here: a791b3f4fca48a5321a7717a7e72120ad34b37f4