Revert with fixes to successor and begin()