rollback changes from release preparation of 445558