Revert "d5"

This reverts commit 854333b98a555fe43066938c73f6c12024ed956e.