not really getting the feel for this, will continue later, need to really learn how this works
This reverts commit 976cedd536.
976cedd536