rollback changes from release preparation of 425874