Revert "Cosmetical Changes"

This reverts commit b2cc293916027d8af228f041c772c484dd1d7e19.

Revert "Kernel Subversion and fix cherrypick derp"

This reverts commit 8e17d633340b2913624ad78c0134dd65ff697b21.

Fix cherrypick Derp.