Broke runtime_unittests, which are still running directly from source. This reverts commit 0ea93c3a3e40426fd222ba22c2f60756c8a32097.