backport spec fix for unbundling rspec