Revert "Gemfile fix"

This reverts commit 9bca8ae8f2feefe42acbdb61004ff5c3ec2a8a65.
Revert "Revert "Fix for failing specs""

This reverts commit 2545b0f85851d1e4ebc1137a2c8786a238e02ee4.