Revert "Merge branch 'rkh-find-admin', fixes travis-ci/travis-ci#1045"

This reverts commit 407fae17e2f6937f1c6f436fe3242c85cd6df06b, reversing
changes made to b4e7372fdd7bd5ecc3f5e8104ccda7ac9d060948.