rollback changes from release preparation of tag1222