Backport of revert backport assistant changes into release/1.1.x (#3063)

Backport of revert backport assistant changes into release/1.1.x (#3063) #702