Revert "There is a better way, duh (+1 squashed commit)"

This reverts commit b3fc93a5c9c23f5071de0a744746dadcae0f802d.
This is getting stupid.