Revert "Merge pull request #8989 from robertomiranda/use-rails-4-find-by"

This reverts commit 637a7d9d357a0f3f725b0548282ca8c5e7d4af4a, reversing
changes made to 5937bd02dee112646469848d7fe8a8bfcef5b4c1.