Upstream took the revert patch in the end as a fix. I refreshed the patch accordingly on stable branch.