Revert "Moar style fixes"

This reverts commit 9313e9b0547f9204b78a5741576adaac4bdbe718.