Remerge on Diff to fix dependency.