Revert "Please shoot me"

This reverts commit 90834d8529c234b8e735aab5b34209cc7d7061a4.