Bz 1003956: rolling back change