Revert #197

This reverts #197, cc: @gregory. The latter broke a lot of downstream gems, we need to find a different way to address the problem.

I am going to yank 3.3.0 and cut 3.3.1.