Back out "[flow][get-def] Use the same heuristic for get-def in requi…

Back out "[flow][get-def] Use the same heuristic for get-def in requi… #1325