XD-1630: Cut dep from xd-shell to xd-dirt