The cherry-pick from upstream isn't quite right. See attached for a backported version of that commit.
The cherry-pick from upstream isn't quite right. See attached for a backported version of that commit.