release: build against backported change

release: build against backported change from r3829