This reverts commit 3a748cbf. I'm reverting this commit because I forgot to format the commit message propertly. Sorry for the thrash.