Revert "backport"

This reverts commit d9adf3d571e86d100ed6d0df6693e212961343d9.