Fix infinite-recurse bug when doing serial number resync.