Revert "d2"

This reverts commit afde6b8fc87e15c667d8d6563e491fd1e69c5193.