[15729] breaks binary compatibility