This reverts commit bc0fea0d. There was a "timeout for a Halide Hexagon test" reported. Revert until investigation complete.