8849bed671
This reverts commit 2aad8fc7bc.
It was a commit without proper review.
A better API needs to be discussed.