This reverts commit 8510313d.

Don't commit late things, without reading the justification.

This is generating dead code, and produce a warning on newer gcc version for that.