This reverts commit ada2e8ea. Still breaking on Fuchsia (and also Fedora) with exit code 1, so back to investigating.