This reverts commit 2f580a9e97, reversing changes made to ce69c966e1.
2f580a9e97
ce69c966e1
Bunch of unfinished code