Get back pop_root & push_root for 2.6.18