Fix resolver

Review at https://rbcommons.com/s/twitter/r/129/

Opening a pull request to see if Travis-CI builds this. Says http://docs.travis-ci.com/user/pull-requests/ this should CI the branch.