revert/cherry-pick: use aggressive merge.