Revert "Fix for failing specs"

This reverts commit 2314438925af827b694fbaaf59c31c49dd2c0c31.

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>

Conflicts:
	Gemfile.lock
Merge pull request #7086 from jvanbaarsen/revert-rspec-fix

Revert "Fix for failing specs"