Adapt to the sourcestamp split