Also disable any heuristics. Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com> Part-of: <!8817>