707b19f397
This reverts commit 35eabf06b9.
This was merged by mistake, there's no consensus yet on the implementation.