revert a few temporary changes

4 jobs for line_search in 7 minutes and 26 seconds (queued for 2 seconds)