ivory: revert changes from merge.