Roll back to earlier (1.5.22) version prior to subscription engine
changes