Merge pull request #401 from pcarlisle/backout-12101

Revert #12101.

This has implications on the minimum version of rspec used, and we either need to bump that or approach this another way. We are still working out which to do, so this can back out until then.