rollback changes from release preparation of 4552