This reverts commit dc322931. We're going to do this more thoroughly in 0.2.2.x, and not in maint-0.2.1.