Revert "revertderp again again"

This reverts commit 199c6add40261793fd9e9c533537c4f590d9871b.