Revert "Fix for failing specs"
Created by: jvanbaarsen
@randx please revert this as quick as possible, it looks like the fix i created in this PR is causing rspec to skip tests. I'm currently working on a new fix for the specs, but this one is causing more issues apparently.
This reverts commit 23144389.
Conflicts: Gemfile.lock