rollback changes from release preparation of 4345665