Revert to noise-based search until origin figured out