rollback changes from release preparation of demo-branch