Revert "d2/jf: unify devices"

This reverts commit f1fcdc5ba6d0f3290859d2e981fe6943b887da9b.