For some reason, unit tests all broke while testing this revision. The
relation between both is not clear to me (this code has worked for me).
In doubt, I revert it for now.
This reverts commit 0057272c.