rollback changes from release preparation of tag3.0