Broke runtime_unittests, which are still running directly from source. This reverts commit 6a89437fec.
6a89437fec