Revert "Prevent possible StackOverflowException"

This reverts commit 253f9eb13fd1b5437b70e20f17c2d52a78f54dda.