Revert "Moar syle fixes"

This reverts commit e9ca311f1c9c3a5fcf5a90b6f97c6ca199155d94.