Revert "Try build without extra non-default versions."

This reverts commit 68871b05d34ba0bbc2cad87d8236322fd3cbdc31.