It's still buggy (of course), but now we'll try to fix it in it's own branch. This reverts commit 1cdbdeef.