Serialize both at the moment, will drop the old one after bootstrap Original commit: ad735cd788
ad735cd788