Revert "Fix for failing specs"

@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 2314438925af827b694fbaaf59c31c49dd2c0c31.

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>

Conflicts:
	Gemfile.lock