Revert r257691, r257645:
 Let amd64/amd64 build again.