Revert "Drop back to 2.0, seeing gc/memory issues"

This reverts commit f63c5f1dab22e911cdcad262fdfa495e22ea59d4.