Temporarily revert until somebody can figure out what to do with the
obsolete Mac toolchain on some tinderbox.

This reverts commit 5f847b3d.