Pull forward Andy's share initialization fix [PL #4227].