This caused a regression where anonymous_id values were not as expected. Reverting for now, with investigation to follow.