d2: un-unify

Change-Id: I9f7fd02ab39caefd6f12934ed503494d2a3a5a92
jf: un-unify

Change-Id: I81579e784000862b557eaea333a22ef163286a74