Remove non-stacking logic from waterfall series, since it forces stacking all the time, close #1571