Looks like upstream also made this reversion in commit 94960d300cd669cc1b856c76dfbfccf7903f4b8e, so obviously worth cherrypicking.
Looks like upstream also made this reversion in commit 94960d300cd669c c1b856c76dfbfcc f7903f4b8e, so obviously worth cherrypicking.