No ticket: Reduce .find
(cherry picked from commit 85b3c82445d9e88c6e747a33ad97f5f9e35a7d35)