Revert "Revert "What the hell?""

This reverts commit 62306112d4bfa492f5a76d764379ff4bf25eba14.