rollback changes from release preparation of 54584