dual-ify

Change-Id: Iac250688839d3cbe984bd459f174ef99b71d4454