Revert "Replaced nested finds with populate."

This reverts commit c7ac2bede91cd1f64c0b5f87ad5c54a8a02e3d4f.