Revert "d1"

This reverts commit f9e21e6a2509b90cde391fb48f86c2999c722feb.
d2