Revert "D1"

This reverts commit c953a304d8259579b4c3944fa7215f49fa9cb089.