Back out big shared_ptr change. Moving to a branch. Apologies all.