This reverts commit rABC9e068b92c3af64a4a131b3479354b2989ff5134f.
This is causing a test failure that I don't understand and didn't manage to reproduce on purpose (it happened randomly twice on my machine after >3000 runs).
This this was intended to be only a cosmetic change and it turns out to be do more than expected, let's revert to avoid introducing some subtle bug.