rollback changes from release preparation of 8987