Revert gerrit 16429 to fix a Debian build-break