rollback changes from release preparation of 478799936