9b27f27924
Unjustified premature merge that goes against our guidelines and the
decision of another committer.
This reverts commit 5d48f44119.