This reverts commit 17014fad.

New features that are not self-contained and modify src/ are not
welcomed in -bugfix branches without pre-existent consensus.