Revert "Stackoverflow"

This reverts commit 94fa561f55c793615e2c2652c5e6422059189591.