rollback changes from release preparation of 845651