rollback changes from release preparation of 566211