Revert "Build issue after https://gerrit.fd.io/r/#/c/16508/."