fix for offline on demand, a full cleanup in 7.3.X