This reverts commit 22cf954991.
22cf954991
There however were some bugs that came with this, so I'm switching to master to explore this.