This reverts commits 3fb08d14 and f8c63a7f. There was a "timeout for a Halide Hexagon test" reported. Revert until investigation complete.