revert back to d2-common

revert back to d2-common