This reverts commit 3c1902fc.
This was accidentally re-added from an old version of the branch before
!265 (merged) was merged. It should not have been re-added.
Re-adding it has broken the build on autotools. This needs to be fixed for 2.58.0.
This will create a new commit in order to revert the existing changes.