Actually that might be broken, gonna investigate
This reverts commit 4f7149b6f71a2acfd1dbfb5c43b5bda66f3dea54.