Drop back to 2.0, seeing gc/memory issues